Commit abbfffc9 authored by Łukasz Nowak's avatar Łukasz Nowak

Simplify.

parent cf74f927
...@@ -53,42 +53,15 @@ ...@@ -53,42 +53,15 @@
<value> <string>from Products.ZSQLCatalog.SQLCatalog import NegatedQuery, Query\n <value> <string>from Products.ZSQLCatalog.SQLCatalog import NegatedQuery, Query\n
\n \n
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
person_uid = portal.ERP5Site_getPropertyFromAuthenticatedMemberPersonValue(\'uid\')\n
person_reference = portal.ERP5Site_getPropertyFromAuthenticatedMemberPersonValue(\'reference\')\n person_reference = portal.ERP5Site_getPropertyFromAuthenticatedMemberPersonValue(\'reference\')\n
\n \n
setup_service = portal.restrictedTraverse(portal.portal_preferences.getPreferredInstanceSetupResource())\n
\n
# XXX Owner column should not be used to fetch the list!\n # XXX Owner column should not be used to fetch the list!\n
# Data model of hosting subscription should be fixed to allow direct query\n # Data model of hosting subscription should be fixed to allow direct query\n
hosting_subscription_list = portal.portal_catalog(\n return portal.portal_catalog(\n
portal_type="Hosting Subscription",\n portal_type="Hosting Subscription",\n
owner=person_reference,\n owner=person_reference,\n
validation_state=\'validated\'\n
)\n )\n
\n
# Only return ongoing hosting subscription\n
return [x for x in hosting_subscription_list if \\\n
(len(portal.portal_catalog(\n
portal_type="Sale Packing List Line",\n
simulation_state=NegatedQuery(Query(simulation_state="delivered")),\n
default_resource_uid=setup_service.getUid(),\n
default_aggregate_uid=x.getUid(),\n
limit=1,\n
)) == 1) or \\\n
(\n
(len(portal.portal_catalog(\n
portal_type="Sale Packing List Line",\n
default_resource_uid=setup_service.getUid(),\n
default_aggregate_uid=x.getUid(),\n
limit=1,\n
)) == 0) and \\\n
(len(portal.portal_catalog(\n
portal_type="Sale Order Line",\n
default_resource_uid=setup_service.getUid(),\n
simulation_state="cancelled",\n
default_aggregate_uid=x.getUid(),\n
limit=1,\n
)) == 0)\n
)]\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
378 379
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment