svn commit: r795054 - /ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml

[ashish-18]

Author: ashish
Date: Fri Jul 17 11:39:12 2009
New Revision: 795054

URL: http://svn.apache.org/viewvc?rev=795054&view=rev
Log:
Applied fix from trunk revision: 795050.
Applied patch from jira issue - OFBIZ-2736 - facilityId not processed correctly in case of quickShipPurchaseOrder.
Thanks Mridul for your contribution.

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

Modified: ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=795054&r1=795053&r2=795054&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Fri Jul 17 11:39:12 2009
@@ -543,7 +543,7 @@
         </if-empty>
 
         <!-- set the destination facility if it is a purchase order -->
-        <if-empty field="shipment.originFacilityId">
+        <if-empty field="shipment.destinationFacilityId">
             <if-compare field="shipment.shipmentTypeId" operator="equals" value="PURCHASE_SHIPMENT">
                 <set from-field="shipment.destinationContactMechId" field="facilityLookup.contactMechId"/>
                 <find-by-and entity-name="FacilityContactMech" map="facilityLookup" list="facilities"/>
@@ -1409,6 +1409,7 @@
 
     <simple-method method-name="quickShipPurchaseOrder" short-description="Quick ships an entire purchase order to a facility">
         <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
+        <entity-one entity-name="Facility" value-field="facility"/>
         <call-simple-method method-name="getOrderItemShipGroupLists"/>
         <call-simple-method method-name="createShipmentForFacilityAndShipGroup"/>
         <log level="info" message="Finished quickShipPurchaseOrder for orderId ${parameters.orderId} and destination facilityId ${parameters.facilityId}"/>
@@ -1466,7 +1467,7 @@
                     <set value="SHIPMENT_INPUT" field="shipmentContext.statusId"/>
                   </then>
                   <else>
-                    <set from-field="facilityId" field="shipmentContext.destinationFacilityId"/>
+                    <set from-field="facility.facilityId" field="shipmentContext.destinationFacilityId"/>
                     <set value="PURCH_SHIP_CREATED" field="shipmentContext.statusId"/>
                   </else>
                 </if>