slapos_accounting: drop compatibility with expliciate trade condition usage

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

@@ -44,7 +44,6 @@ def newOpenOrder(start_date, service,
   open_sale_order = module.newContent(
     portal_type=order_portal_type,
     temp_object=temp_order,
-    specialise=specialise,
     effective_date=DateTime(),
     start_date=start_date,
     # Ensure stop date value is higher than start date
@@ -109,10 +108,6 @@ def newOpenOrder(start_date, service,
 
   open_sale_order.SaleOrder_applySaleTradeCondition(batch_mode=1, force=1)
 
-  # Check compatibility with previous template
-  if specialise is not None:
-    assert open_sale_order.getSpecialise() == specialise
-
   if price is None:
     price = open_order_cell.getPrice()
 
@@ -165,7 +160,7 @@ if instance_tree.getCausalityState() == 'diverged':
       # Search for matching resource
       service, software_release, software_type = instance_tree.InstanceTree_getSoftwareProduct()
       if (service is None) or (service.getUse() != 'trade/sale'):
-        # XXX Add comment on instance tree
+        storeWorkflowComment(instance_tree, "No software product found")
         return
         #raise NotImplementedError('No Software Product defined for %s' % instance_tree.getRelativeUrl())
 

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