You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2014/07/10 10:36:51 UTC
svn commit: r1609420 - in /ofbiz/branches/release12.04: ./
applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Author: jacopoc
Date: Thu Jul 10 08:36:50 2014
New Revision: 1609420
URL: http://svn.apache.org/r1609420
Log:
Applied fix from trunk for revision: 1609418
===
Fix by Darrell Donati for bug reported in OFBIZ-5578: setPackedOnly parameter was not used to prevent a shipment to be moved to its final status.
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1609418
Modified: ofbiz/branches/release12.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=1609420&r1=1609419&r2=1609420&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/branches/release12.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Thu Jul 10 08:36:50 2014
@@ -1322,6 +1322,7 @@ under the License.
<!-- should never be empty - referential integrity enforced -->
<set field="eventDate" from-field="parameters.eventDate"/>
+ <set field="setPackedOnly" from-field="parameters.setPackedOnly"/>
<call-simple-method method-name="createShipmentForFacilityAndShipGroup"/>
</iterate>
@@ -1549,12 +1550,12 @@ under the License.
<set from-field="eventDate" field="packedContext.eventDate"/>
<set value="SHIPMENT_PACKED" field="packedContext.statusId"/>
<call-service service-name="updateShipment" in-map-name="packedContext"/>
- <!-- update the shipment status to shipped -->
- <if-not-empty field="setPackedOnly">
+ <!-- update the shipment status to shipped (if setPackedOnly has NOT been set) -->
+ <if-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>
+ </if-empty>
</then>
<else> <!-- PURCHASE_ORDER -->
<!-- update the shipment status to shipped -->