svn commit: r713828 - /ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml

[sichen]

Author: sichen
Date: Thu Nov 13 13:19:16 2008
New Revision: 713828

URL: http://svn.apache.org/viewvc?rev=713828&view=rev
Log:
fix bug where packing multiple ship groups to different destinations associates the wrong shipping address to the shipment (note how these conditions never end up 'overwriting' the contact mechs from earlier in the method)

Modified:
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=713828&r1=713827&r2=713828&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Thu Nov 13 13:19:16 2008
@@ -557,12 +557,8 @@
         <!-- TODO: maybe we should add a new entity for OrderItemShipGroup ContactMechs? -->
         <if-not-empty field="orderItemShipGroup">
             <if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER">
-                <if-empty field="shipment.destinationContactMechId">
-                    <set from-field="orderItemShipGroup.contactMechId" field="shipment.destinationContactMechId"/>
-                </if-empty>
-                <if-empty field="shipment.destinationTelecomNumberId">
-                    <set from-field="orderItemShipGroup.telecomContactMechId" field="shipment.destinationTelecomNumberId"/>
-                </if-empty>
+                <set from-field="orderItemShipGroup.contactMechId" field="shipment.destinationContactMechId"/>
+                <set from-field="orderItemShipGroup.telecomContactMechId" field="shipment.destinationTelecomNumberId"/>
             </if-compare>
         </if-not-empty>