slapos_accounting: search the trade condition with searchPredicateList

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Alarm_requestUpdateInstanceTreeOpenSaleOrder.py

@@ -2,7 +2,6 @@ portal = context.getPortalObject()
 
 portal.portal_catalog.searchAndActivate(
   method_id='InstanceTree_requestUpdateOpenSaleOrder',
-  method_kw=dict(specialise="sale_trade_condition_module/default_subscription_trade_condition", ),
   portal_type="Instance Tree",
   causality_state="diverged",
   activate_kw={'tag': tag, 'priority': 2},

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/InstanceTree_requestUpdateOpenSaleOrder.py

@@ -115,6 +115,13 @@ if instance_tree.getCausalityState() == 'diverged':
         **edit_kw
       )
 
+      open_order = open_order_line.getParentValue()
+      open_order.SaleOrder_applySaleTradeCondition(batch_mode=1, force=1)
+
+      # Check compatibility with previous template
+      if specialise is not None:
+        assert open_order.getSpecialise() == specialise
+
       predicate_list = []
       inherited_trade_condition = open_sale_order.getSpecialiseValue()
       while inherited_trade_condition is not None:
@@ -141,12 +148,6 @@ if instance_tree.getCausalityState() == 'diverged':
 
       storeWorkflowComment(open_sale_order, open_order_explanation)
 
-      open_order = open_order_line.getParentValue()
-      open_order.SaleOrder_applySaleTradeCondition(batch_mode=1, force=1)
-
-      # Check compatibility with previous template
-      assert open_order.getSpecialise() == specialise
-
     if open_order_line is not None:
       open_order = open_order_line.getParentValue()
 

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/InstanceTree_requestUpdateOpenSaleOrder.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>specialise, REQUEST=None</string> </value>
+            <value> <string>specialise=None, REQUEST=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>