From dfb2d23c488fc9fa2946761b414d8c046177807b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Wed, 22 Feb 2012 14:37:03 +0100
Subject: [PATCH] Set price and quantity unconditionally.

---
 .../DeliveryLineSetZeroPriceAndOrUpdateAppliedRule.xml      | 6 ++----
 .../SaleOrderLine_setPriceToZeroAndOrUpdateAppliedRule.xml  | 6 ++----
 master/bt5/vifib_upgrader/bt/revision                       | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/DeliveryLineSetZeroPriceAndOrUpdateAppliedRule.xml b/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/DeliveryLineSetZeroPriceAndOrUpdateAppliedRule.xml
index 8466056d3..5c34a9bde 100644
--- a/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/DeliveryLineSetZeroPriceAndOrUpdateAppliedRule.xml
+++ b/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>
diff --git a/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleOrderLine_setPriceToZeroAndOrUpdateAppliedRule.xml b/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleOrderLine_setPriceToZeroAndOrUpdateAppliedRule.xml
index 58d5b5c69..bdc8e80a8 100644
--- a/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleOrderLine_setPriceToZeroAndOrUpdateAppliedRule.xml
+++ b/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>
diff --git a/master/bt5/vifib_upgrader/bt/revision b/master/bt5/vifib_upgrader/bt/revision
index dc7b54ad0..3e932fe8f 100644
--- a/master/bt5/vifib_upgrader/bt/revision
+++ b/master/bt5/vifib_upgrader/bt/revision
@@ -1 +1 @@
-33
\ No newline at end of file
+34
\ No newline at end of file
-- 
2.30.9