svn commit: r1547548 - /ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml

Author: jleroux
Date: Tue Dec  3 19:40:57 2013
New Revision: 1547548

URL: http://svn.apache.org/r1547548
Log:
A patch from  Praveen Agrawal for "Checking with orderAdjustment.productPromoId rather than adjustment.productPromoId" https://issues.apache.org/jira/browse/OFBIZ-5411

While iterating the adjustments list we are checking with orderAdjustment.productPromoId rather then the adjustment.productPromoId. Using orderAdjustment.productPromoId the condition will never true and the newOrderAdjustmentTotal will always be 0.



Modified:
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=1547548&r1=1547547&r2=1547548&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec  3 19:40:57 2013
@@ -682,7 +682,7 @@ under the License.
         <iterate list="adjustments" entry="adjustment">
             <if>
                 <condition>
-                    <not><if-empty field="orderAdjustment.productPromoId"/></not>
+                    <not><if-empty field="adjustment.productPromoId"/></not>
                 </condition>
                 <then>
                     <calculate field="newOrderAdjustmentTotal" decimal-scale="3">