Author: jleroux
Date: Sun Aug 5 14:03:03 2012
New Revision: 1369592
URL: http://svn.apache.org/viewvc?rev=1369592&view=rev
Log:
Revert r1057532. It was an automatic merge I did. There was an error and I have
not enough time to do it properly by hand
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=1369592&r1=1369591&r2=1369592&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
Sun Aug 5 14:03:03 2012
@@ -104,38 +104,35 @@ under the License.
<field-map field-name="orderId"
from-field="orderHeader.orderId"/>
</entity-and>
- <set field="groupName"/>
- <set field="groupName1"/> <!-- Group by Shipping Method -->
- <set field="groupName2"/> <!-- Group by Warehouse Area -->
- <set field="groupName3"/> <!-- Group by Number of Order Items -->
-
- <!-- If user does not select any grouping method, then skip the
grouping part. This is the default behavior of the picking screen -->
- <if>
- <condition>
- <and>
- <if-empty field="groupByShippingMethod"/>
- <if-empty field="groupByWarehouseArea"/>
- <if-empty field="groupByNoOfOrderItems"/>
- </and>
- </condition>
- <then>
- <set field="groupName" from-field="orderHeader.orderId"/>
- </then>
- <else>
- <entity-condition
entity-name="OrderHeaderAndItemFacilityLocation"
list="OrderHeaderAndItemFacilityLocationList" distinct="true">
- <condition-list combine="and">
- <condition-expr field-name="orderId"
from-field="orderHeader.orderId"/>
- <condition-list combine="or">
- <condition-expr field-name="locationTypeEnumId"
operator="equals" value="FLT_PICKLOC"/>
- <condition-expr field-name="locationTypeEnumId"
operator="equals" from-field="nullField"/>
- </condition-list>
- </condition-list>
- <select-field field-name="shipmentMethodTypeId"/>
- <select-field field-name="areaId"/>
- <use-iterator/>
- </entity-condition>
- <iterate list="OrderHeaderAndItemFacilityLocationList"
entry="orderHeaderAndItemFacilityLocation">
- <!-- set groupName for order according to the options selected
by the user -->
+ <iterate list="orderItems" entry="orderItem">
+ <!-- get information about location for each order item -->
+ <entity-and entity-name="OrderItemAndFacilityLocationView"
list="OrderItemAndFacilityLocationList">
+ <field-map field-name="orderId"
from-field="orderHeader.orderId"/>
+ <field-map field-name="locationTypeEnumId"
value="FLT_PICKLOC"/>
+ <field-map field-name="orderItemSeqId"
from-field="orderItem.orderItemSeqId"/>
+ <order-by field-name="orderItemSeqId"/>
+ </entity-and>
+
+ <iterate entry="OrderItemAndFacilityLocation"
list="OrderItemAndFacilityLocationList">
+ <!-- set groupName for order according to user selected
options and available informations -->
+ <set field="groupName1" value=""/>
+ <set field="groupName2" value=""/>
+ <set field="groupName3" value=""/>
+ <if>
+ <condition>
+ <or>
+ <if-compare field="groupByShippingMethod"
operator="equals" value="Y"/>
+ <and>
+ <if-empty field="groupByShippingMethod"/>
+ <if-empty field="groupByWarehouseArea"/>
+ <if-empty field="groupByNoOfOrderItems"/>
+ </and>
+ </or>
+ </condition>
+ <then>
+ <set field="groupName1"
from-field="OrderItemAndFacilityLocation.shipmentMethodTypeId"/>
+ </then>
+ </if>
<if-compare field="groupByWarehouseArea" operator="equals"
value="Y">
<set field="groupName2"
from-field="OrderItemAndFacilityLocation.areaId"/>
