svn commit: r773229 - /ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml

[ashish-18]

Author: ashish
Date: Sat May  9 15:02:29 2009
New Revision: 773229

URL: http://svn.apache.org/viewvc?rev=773229&view=rev
Log:
Applied patch from JIRA issue: OFBIZ-2436 (Improvement in Verify Pick screen to issue items as well when shipment is created)

Quick ship entire order process was broken due to removal of conditional check. Putting back that condition.
For more details see the comment on JIRA issue.

Thanks Akash for your contribution.

PS: Vikas I am committing this code as Akash was feeling upset due to functionality break and we all know that few of us use trunk in Production. So its safe to commit ASAP.


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

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=773229&r1=773228&r2=773229&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Sat May  9 15:02:29 2009
@@ -241,6 +241,16 @@
         <if-compare value="0" operator="equals" field="orderItemShipGrpInvRes.quantity" type="BigDecimal">
             <!-- if none left reserved, remove OIIR -->
             <remove-value value-field="orderItemShipGrpInvRes"/>
+            <if-compare field="shipment.statusId" operator="not-equals" value="SHIPMENT_PICKED">
+                <!-- if there are no more OIIRs for the orderItem, set the orderItem.statusId to ITEM_COMPLETED -->
+                <get-related value-field="orderItem" relation-name="OrderItemShipGrpInvRes" list="otherOiirs"/>
+                <if-empty field="otherOiirs">
+                    <set value="ITEM_COMPLETED" field="changeOrderItemStatusMap.statusId"/>
+                    <set from-field="orderItem.orderId" field="changeOrderItemStatusMap.orderId"/>
+                    <set from-field="orderItem.orderItemSeqId" field="changeOrderItemStatusMap.orderItemSeqId"/>
+                    <call-service service-name="changeOrderItemStatus" in-map-name="changeOrderItemStatusMap"/>
+                </if-empty>
+            </if-compare>
         <else>
             <store-value value-field="orderItemShipGrpInvRes"/>
         </else>