diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml index 0955497433aa29ee6b082a1161a7112ea79940f5..750b375f5db41443559bcd192c07e23498cde875 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml @@ -65,11 +65,14 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>if context.getDestinationValue() is None:\n - return context.generatePredicate(membership_criterion_base_category_list = (\'resource\',),\n - criterion_property_list = (\'start_date\',))\n + <value> <string>base_category_tuple = (\'resource\',)\n \n -return context.generatePredicate(membership_criterion_base_category_list = (\'destination\', \'resource\'),\n +if context.getSource():\n + base_category_tuple += (\'source\',)\n +if context.getDestination():\n + base_category_tuple += (\'destination\',)\n +\n +return context.generatePredicate(membership_criterion_base_category_list = base_category_tuple,\n criterion_property_list = (\'start_date\',))\n </string> </value> </item> @@ -121,9 +124,10 @@ return context.generatePredicate(membership_criterion_base_category_list = (\'de <tuple> <string>args</string> <string>kw</string> + <string>base_category_tuple</string> <string>_getattr_</string> <string>context</string> - <string>None</string> + <string>_inplacevar_</string> </tuple> </value> </item> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml index 1ed7252c57e855cafe6f664683b9addb6aa1789c..544a0b674f26f3e28c8fca62c64d2d7921d0dd93 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml @@ -65,11 +65,14 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>if context.getDestinationValue() is None:\n - return context.generatePredicate(membership_criterion_base_category_list = (\'resource\',),\n - criterion_property_list = (\'start_date\',))\n + <value> <string>base_category_tuple = (\'resource\',)\n \n -return context.generatePredicate(membership_criterion_base_category_list = (\'destination\', \'resource\'),\n +if context.getSource():\n + base_category_tuple += (\'source\',)\n +if context.getDestination():\n + base_category_tuple += (\'destination\',)\n +\n +return context.generatePredicate(membership_criterion_base_category_list = base_category_tuple,\n criterion_property_list = (\'start_date\',))\n </string> </value> </item> @@ -115,9 +118,10 @@ return context.generatePredicate(membership_criterion_base_category_list = (\'de <tuple> <string>args</string> <string>kw</string> + <string>base_category_tuple</string> <string>_getattr_</string> <string>context</string> - <string>None</string> + <string>_inplacevar_</string> </tuple> </value> </item> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 12e255591973bdba2df68092427a8e1f954f18dc..a5b5e0f80574a9027f0861599555b84284347a3b 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -177 \ No newline at end of file +181 \ No newline at end of file