Set specialise in more steps.

First stabilise orders.
Then during linking update linked packing list
Lastly while playing with non linked packing list set correct specialise.

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/DeliveryLineSetZeroPriceAndOrUpdateAppliedRule.xml

@@ -51,14 +51,11 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>portal_type = context.getPortalType()\n
-assert( portal_type in context.getPortalDeliveryMovementTypeList() + (\'Sale Order Line\',) )\n
+assert( portal_type in context.getPortalDeliveryMovementTypeList())\n
 common_specialise = \'sale_trade_condition_module/vifib_trade_condition\'\n
 specialise = context.getParentValue().getSpecialise()\n
 if common_specialise != specialise:\n
   context.getParentValue().setSpecialise(common_specialise)\n
-if portal_type == \'Sale Order Line\':\n
-  # nothing else to do\n
-  return\n
 context.setPrice(0.0)\n
 if context.getSimulationState() == \'cancelled\':\n
   # force no simulation\n

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_setDeliveryLinePriceZeroAndOrUpdateAppliedRule.xml

@@ -51,7 +51,7 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>context.getPortalObject().portal_catalog.searchAndActivate(\n
-  portal_type=context.getPortalDeliveryMovementTypeList() + (\'Sale Order Line\',),\n
+  portal_type=context.getPortalDeliveryMovementTypeList(),\n
   method_id=\'DeliveryLineSetZeroPriceAndOrUpdateAppliedRule\'\n
 )\n
 </string> </value>

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleOrderLine_linkSimulationMovementToPackingListLine.xml

@@ -72,6 +72,11 @@ if delivery_simulation.getDelivery() == packing_list_line:\n
   return\n
 assert(delivery_simulation.getDelivery() is None)\n
 delivery_simulation.setDelivery(packing_list_line)\n
+delivery = packing_list_line.getParentValue()\n
+common_specialise = \'sale_trade_condition_module/vifib_trade_condition\'\n
+specialise = delivery.getSpecialise()\n
+if common_specialise != specialise:\n
+  delivery.setSpecialise(common_specialise)\n
 </string> </value>
         </item>
         <item>

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleOrderLine_setPriceToZeroAndOrUpdateAppliedRule.xml

@@ -54,6 +54,10 @@
   raise ValueError(\'%s is not sale order line\' % context.getPath())\n
 context.setPrice(0.0)\n
 context.setQuantity(1.0)\n
+common_specialise = \'sale_trade_condition_module/vifib_trade_condition\'\n
+specialise = context.getParentValue().getSpecialise()\n
+if common_specialise != specialise:\n
+  context.getParentValue().setSpecialise(common_specialise)\n
 context.getParentValue().Delivery_updateAppliedRule()\n
 </string> </value>
         </item>

master/bt5/vifib_upgrader/bt/revision

-37
+38
\ No newline at end of file