svn commit: r781698 - /ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml

[mor-2]

Author: mor
Date: Thu Jun  4 09:58:34 2009
New Revision: 781698

URL: http://svn.apache.org/viewvc?rev=781698&view=rev
Log:
Applied fix from trunk for revision: 781696
 Fixed UEL exception in picking screen in facility with the solution proposed by Adrian. Issue reported by Arun Patidar in

Modified:
    ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml

Modified: ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=781698&r1=781697&r2=781698&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Thu Jun  4 09:58:34 2009
@@ -349,16 +349,16 @@
 
                                 <!-- pick now, or needs stock move first? -->
                                 <!-- put in pick or move lists for the groupName prepared according to selected options by user -->
-                                <if-empty field="pickMoveInfoMap.${groupName}.${groupName}">
-                                    <get-related-one value-field="orderItemShipGroup" relation-name="ShipmentMethodType" to-value-field="pickMoveInfoMap.${groupName}.${groupName}.shipmentMethodType"/>
+                                <if-empty field="pickMoveInfoMap[groupName][groupName]">
+                                    <get-related-one value-field="orderItemShipGroup" relation-name="ShipmentMethodType" to-value-field="pickMoveInfoMap[groupName][groupName].shipmentMethodType"/>
                                 </if-empty>
                                 <if-compare field="needsStockMove" operator="equals" value="Y">
-                                    <field-to-list field="orderHeaderInfo" list="pickMoveInfoMap.${groupName}.orderNeedsStockMoveInfoList"/>
+                                    <field-to-list field="orderHeaderInfo" list="pickMoveInfoMap[groupName].orderNeedsStockMoveInfoList"/>
                                     <if-compare field="orderHeader.isRushOrder" operator="equals" value="Y">
                                         <field-to-list field="orderHeaderInfo" list="rushOrderInfo.orderNeedsStockMoveInfoList"/>
                                     </if-compare>
                                 <else>
-                                    <field-to-list field="orderHeaderInfo" list="pickMoveInfoMap.${groupName}.orderReadyToPickInfoList"/>
+                                    <field-to-list field="orderHeaderInfo" list="pickMoveInfoMap[groupName].orderReadyToPickInfoList"/>
                                     <if-compare field="orderHeader.isRushOrder" operator="equals" value="Y">
                                         <field-to-list field="orderHeaderInfo" list="rushOrderInfo.orderReadyToPickInfoList"/>
                                     </if-compare>
@@ -370,10 +370,10 @@
                                     <calcop field="numberSoFar" operator="add"><number value="1"/></calcop>
                                 </calculate>
                                 <log level="info" message="Added order #${orderHeader.orderId} to pick list [${numberSoFar} of ${parameters.maxNumberOfOrders}] - ${pickThisOrder} / ${allPickStarted}"/>
-                                <set field="pickMoveInfoMap.${groupName}.groupName" from-field="groupName"/>
-                                <set field="pickMoveInfoMap.${groupName}.groupName1" from-field="groupName1"/>
-                                <set field="pickMoveInfoMap.${groupName}.groupName2" from-field="groupName2"/>
-                                <set field="pickMoveInfoMap.${groupName}.groupName3" from-field="noOfOrderItems"/>
+                                <set field="pickMoveInfoMap[groupName].groupName" from-field="groupName"/>
+                                <set field="pickMoveInfoMap[groupName].groupName1" from-field="groupName1"/>
+                                <set field="pickMoveInfoMap[groupName].groupName2" from-field="groupName2"/>
+                                <set field="pickMoveInfoMap[groupName].groupName3" from-field="noOfOrderItems"/>
                             </then>
                             <else>
                                 <log level="info" message="Order #${orderHeader.orderId} was not added to pick list [${numberSoFar} of ${parameters.maxNumberOfOrders}] - ${pickThisOrder} / ${allPickStarted}"/>
@@ -406,8 +406,8 @@
 
         <!-- find all groupName, for each one get the value from the pickMoveInfoMap and add it to the pickMoveInfoList -->
         <iterate list="groupNames" entry="groupName">
-            <if-not-empty field="pickMoveInfoMap.${groupName}">
-                <field-to-list field="pickMoveInfoMap.${groupName}" list="pickMoveInfoList"/>
+            <if-not-empty field="pickMoveInfoMap[groupName]">
+                <field-to-list field="pickMoveInfoMap[groupName]" list="pickMoveInfoList"/>
             </if-not-empty>
         </iterate>
         <clear-field field="groupNames"/>