[OFBiz] SVN: r5884 - trunk/applications/order/script/org/ofbiz/order/order

[jonesde at svn.ofbiz.org]

Author: jonesde
Date: 2005-10-01 13:15:47 -0500 (Sat, 01 Oct 2005)
New Revision: 5884

Modified:
   trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
Log:
Added missing calculate tag for operation to do an absolute value sort of thing; reported by Ashish Hareet; Jira #OFBIZ-506

Modified: trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
===================================================================
--- trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml	2005-10-01 07:32:36 UTC (rev 5883)
+++ trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml	2005-10-01 18:15:47 UTC (rev 5884)
@@ -158,8 +158,8 @@
             </if-compare-field>
 
             <!-- Workaround for bug: returnPrice=16.99, returnablePrice=16.9894 => OrderReturnPriceCannotExceedThePurchasePrice -->
-            <calculate field-name="epsilon" type="Double"><number value="0.01"/></calculate>
-            <calculate field-name="zero" type="Double"><number value="0.0"/></calculate>
+            <set field="epsilon" value="0.01" type="Double"/>
+            <set field="zero" value="0.0" type="Double"/>
             <calculate field-name="returnPriceDelta" type="Double">
                 <calcop operator="subtract">
                     <calcop operator="get" field-name="returnPrice" map-name="parameters"/>
@@ -167,7 +167,7 @@
                 </calcop>
             </calculate>
             <if-compare-field field-name="returnPriceDelta" operator="less" to-field-name="zero" type="Double">
-                <calcop field-name="returnPriceDelta" operator="negative"/>
+                <calculate field-name="returnPriceDelta" type="Double"><calcop field-name="returnPriceDelta" operator="negative"/></calculate>
             </if-compare-field>
 
             <if-compare-field field-name="returnPriceDelta" operator="greater-equals" to-field-name="epsilon" type="Double">