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

[sichen]

Author: sichen
Date: Wed Mar 14 11:59:56 2007
New Revision: 518264

URL: http://svn.apache.org/viewvc?view=rev&rev=518264
Log:
The updateOrderStatusFromReceipt service was checking for completion of orderItems via the ITEM_RECEIVED status, which doesn't exist. Changed it to look for ITEM_COMPLETED instead.

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?view=diff&rev=518264&r1=518263&r2=518264
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Wed Mar 14 11:59:56 2007
@@ -120,18 +120,18 @@
             </if-compare>
         </iterate>
 
-        <!-- check to see if all items have been received -->
-        <entity-and entity-name="OrderItem" list-name="allReturnItems">
+        <!-- check to see if all items have been completed -->
+        <entity-and entity-name="OrderItem" list-name="allOrderItems">
             <field-map field-name="orderId" env-name="parameters.orderId"/>
         </entity-and>
-        <set value="true" field="allReceived"/>
-        <iterate list-name="allReturnItems" entry-name="item">
-            <if-compare field-name="item.statusId" operator="not-equals" value="ITEM_RECEIVED">
-                <set value="false" field="allReceived"/>
+        <set value="true" field="allCompleted"/>
+        <iterate list-name="allOrderItems" entry-name="item">
+            <if-compare field-name="item.statusId" operator="not-equals" value="ITEM_COMPLETED">
+                <set value="false" field="allCompleted"/>
             </if-compare>
         </iterate>
-
-        <if-compare field-name="allReceived" operator="equals" value="true">
+        
+        <if-compare field-name="allCompleted" operator="equals" value="true">
             <!-- update the order header -->
             <set field="orderHeader.statusId" value="ORDER_COMPLETED"/>
             <store-value value-name="orderHeader"/>