You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/12/03 20:42:26 UTC
svn commit: r1547551 - in /ofbiz/branches/release11.04: ./
applications/order/script/org/ofbiz/order/order/OrderServices.xml
Author: jleroux
Date: Tue Dec 3 19:42:26 2013
New Revision: 1547551
URL: http://svn.apache.org/r1547551
Log:
"Applied fix from trunk for revision: 1547548 "
------------------------------------------------------------------------
r1547548 | jleroux | 2013-12-03 20:40:57 +0100 (mar. 03 déc. 2013) | 6 lignes
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/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1547548
Modified: ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=1547551&r1=1547550&r2=1547551&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 3 19:42:26 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">