slapos_accounting: experiment new trade condition

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

@@ -22,11 +22,10 @@ def storeWorkflowComment(document, comment):
 def newOpenOrder():
   new_open_sale_order = portal.open_sale_order_module.newContent(
     portal_type="Open Sale Order",
-    specialise="sale_trade_condition_module/slapos_subscription_trade_condition",
+    # XXX HARDCODED
+    specialise=specialise,
     effective_date=DateTime(),
     activate_kw=activate_kw,
-    #source=open_sale_order_template.getSource(),
-    #source_section=open_sale_order_template.getSourceSection(),
     destination=person.getRelativeUrl(),
     destination_decision=person.getRelativeUrl(),
     title="%s SlapOS Subscription" % person.getTitle()
@@ -125,13 +124,14 @@ if instance_tree.getCausalityState() == 'diverged':
 
     if open_order_line is not None:
       open_order = open_order_line.getParentValue()
+      open_order.SaleOrder_applySaleTradeCondition(batch_mode=1)
 
       # Check compatibility with previous template
       assert open_order.getSourceSection() == 'organisation_module/slapos'
       assert open_order.getDestinationSection() == 'organisation_module/slapos'
       assert open_order.getSource() == 'organisation_module/slapos'
       assert open_order.getPriceCurrency() == 'currency_module/EUR'
-      assert open_order.getSpecialise() == 'sale_trade_condition_module/slapos_subscription_trade_condition'
+      assert open_order.getSpecialise() == specialise
 
       assert open_order_line.getResource() == 'service_module/slapos_instance_subscription'
       assert open_order_line.getQuantityUnit() == 'unit/piece'

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>REQUEST=None</string> </value>
+            <value> <string>specialise="sale_trade_condition_module/couscous_trade_condition", REQUEST=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

master/bt5/slapos_accounting/bt/template_keep_last_workflow_history_only_path_list

 currency_module/CNY
 currency_module/EUR
+sale_trade_condition_module/couscous_trade_condition
 sale_trade_condition_module/slapos_aggregated_consumption_trade_condition
 sale_trade_condition_module/slapos_aggregated_consumption_trade_condition/**
 sale_trade_condition_module/slapos_aggregated_subscription_trade_condition

master/bt5/slapos_accounting/bt/template_path_list

@@ -72,6 +72,7 @@ portal_solvers/Automatic Quantity Adopt Solver/**
 sale_packing_list_module/slapos_accounting_instance_delivery_line_template
 sale_packing_list_module/slapos_accounting_instance_delivery_line_template/**
 sale_packing_list_module/slapos_accounting_instance_delivery_template
+sale_trade_condition_module/couscous_trade_condition
 sale_trade_condition_module/slapos_aggregated_consumption_trade_condition
 sale_trade_condition_module/slapos_aggregated_consumption_trade_condition/**
 sale_trade_condition_module/slapos_aggregated_subscription_trade_condition