svn commit: r767012 - /ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml

[jacopoc]

Author: jacopoc
Date: Tue Apr 21 06:39:34 2009
New Revision: 767012

URL: http://svn.apache.org/viewvc?rev=767012&view=rev
Log:
Reverted change I did in rev. 766704: restored the original syntax after Andrian enhanced the UEL connector to support it.

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

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml?rev=767012&r1=767011&r2=767012&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Tue Apr 21 06:39:34 2009
@@ -85,11 +85,11 @@
             <field-map field-name="orderId" from-field="parameters.orderId"/>
         </entity-and>
         <iterate list="shipmentReceipts" entry="receipt">
-            <if-empty field="totalsMap.receipt.orderItemSeqId">
-                <set field="totalsMap.receipt.orderItemSeqId" value="0" type="BigDecimal"/>
+            <if-empty field="totalsMap.${receipt.orderItemSeqId}">
+                <set field="totalsMap.${receipt.orderItemSeqId}" value="0" type="BigDecimal"/>
             </if-empty>
-            <calculate field="totalsMap.receipt.orderItemSeqId">
-                <calcop field="totalsMap.receipt.orderItemSeqId" operator="add">
+            <calculate field="totalsMap.${receipt.orderItemSeqId}">
+                <calcop field="totalsMap.${receipt.orderItemSeqId}" operator="add">
                     <calcop field="receipt.quantityAccepted" operator="get"/>
                     <calcop field="receipt.quantityRejected" operator="get"/>
                 </calcop>
@@ -98,7 +98,7 @@
             <set from-field="receipt.orderItemSeqId" field="newLookupMap.orderItemSeqId"/>
             <find-by-primary-key entity-name="OrderItem" map="newLookupMap" value-field="orderItem"/>
             <if-compare field="orderItem.statusId" operator="not-equals" value="ITEM_COMPLETED">
-                <if-compare-field field="orderItem.quantity" to-field="totalsMap.receipt.orderItemSeqId" operator="less-equals" type="BigDecimal">
+                <if-compare-field field="orderItem.quantity" to-field="totalsMap.${receipt.orderItemSeqId}" operator="less-equals" type="BigDecimal">
                     <!-- update the status for the item -->
                     <set field="orderItem.statusId" value="ITEM_COMPLETED"/>
                     <store-value value-field="orderItem"/>