Set price and quantity unconditionally.

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

@@ -54,10 +54,8 @@
 if context.getSimulationState() == \'cancelled\':\n
   return\n
 price = context.getPrice()\n
-if price != 0.0:\n
-  context.setPrice(0.0)\n
-if quantity != 1.0:\n
-  context.setQuantity(1.0)\n
+context.setPrice(0.0)\n
+context.setQuantity(1.0)\n
 context.getParentValue().Delivery_updateAppliedRule()\n
 </string> </value>
         </item>

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

@@ -53,10 +53,8 @@
             <value> <string>if context.getPortalType() != \'Sale Order Line\':\n
   raise ValueError(\'%s is not sale order line\' % context.getPath())\n
 price = context.getPrice()\n
-if price != 0.0:\n
-  context.setPrice(0.0)\n
-if quantity != 1.0:\n
-  context.setQuantity(1.0)\n
+context.setPrice(0.0)\n
+context.setQuantity(1.0)\n
 context.getParentValue().Delivery_updateAppliedRule()\n
 </string> </value>
         </item>

master/bt5/vifib_upgrader/bt/revision

-33
\ No newline at end of file
+34
\ No newline at end of file