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

[jaz-3]

Author: jaz
Date: Fri Jun 24 15:02:22 2011
New Revision: 1139346

URL: http://svn.apache.org/viewvc?rev=1139346&view=rev
Log:
fixed issue where setPackedOnly flag was being ignored when calling quickShipEntireOrder

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=1139346&r1=1139345&r2=1139346&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 Fri Jun 24 15:02:22 2011
@@ -1550,9 +1550,11 @@ under the License.
                     <set value="SHIPMENT_PACKED" field="packedContext.statusId"/>
                     <call-service service-name="updateShipment" in-map-name="packedContext"/>
                     <!-- update the shipment status to shipped -->
-                    <set from-field="shipment.shipmentId" field="packedContext.shipmentId"/>
-                    <set value="SHIPMENT_SHIPPED" field="packedContext.statusId"/>
-                    <call-service service-name="updateShipment" in-map-name="packedContext"/>
+                    <if-not-empty field="setPackedOnly">
+                        <set from-field="shipment.shipmentId" field="packedContext.shipmentId"/>
+                        <set value="SHIPMENT_SHIPPED" field="packedContext.statusId"/>
+                        <call-service service-name="updateShipment" in-map-name="packedContext"/>
+                    </if-not-empty>
                   </then>
                   <else> <!-- PURCHASE_ORDER -->
                     <!-- update the shipment status to shipped -->