svn commit: r562613 - /ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml

[apatel-2]

Author: apatel
Date: Fri Aug  3 16:22:20 2007
New Revision: 562613

URL: http://svn.apache.org/viewvc?view=rev&rev=562613
Log:
bug fix in reservation of shadow item.

Modified:
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?view=diff&rev=562613&r1=562612&r2=562613
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Fri Aug  3 16:22:20 2007
@@ -269,6 +269,7 @@
           <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
         </if-compare>
         <set-service-fields map-name="parameters" to-map-name="cancelOrderItemShipGrpInvResMap" service-name="cancelOrderItemShipGrpInvRes"/>
+        <set field="cancelOrderItemShipGrpInvResMap.cancelQuantity" from-field="parameters.quantity"/>
         <!-- Step 1 cancel our reservation, we'll later reserve Inventory we want-->
         <call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>
         <!-- Lets find the inventory to reserve -->
@@ -279,7 +280,6 @@
             <field-map field-name="serialNumber" env-name="parameters.serialNumber"/>
         </entity-and>        
         <first-from-list list-name="inventoryItems" entry-name="inventoryItem"/>
-
         <!--Step 2 Check if its reserved for other order -->
         <set field="inventoryReservationLookUp.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
         <find-by-and map-name="inventoryReservationLookUp" list-name="invReservations" entity-name="OrderItemShipGrpInvRes"/>
@@ -310,6 +310,14 @@
                 <set value="INV_PROMISED" field="availableInventoryItem.statusId"/>
                 <store-value value-name="availableInventoryItem"/>
                 <set from-field="availableInventoryItem.inventoryItemId" field="reserveOisgirMap.inventoryItemId"/>
+             <else>
+                <entity-and entity-name="InventoryItem" list-name="inventoryItems">                
+                    <field-map field-name="productId" env-name="parameters.productId"/>
+                    <field-map field-name="inventoryItemTypeId"  value="NON_SERIAL_INV_ITEM"/>
+                </entity-and>
+                <first-from-list list-name="inventoryItems" entry-name="availableInventoryItem"/>
+                <set from-field="availableInventoryItem.inventoryItemId" field="reserveOisgirMap.inventoryItemId"/>
+             </else>  
             </if-compare>
             <!-- store OrderItemShipGrpInvRes record -->
             <set from-field="inventoryItemReservation.orderId" field="reserveOisgirMap.orderId"/>
@@ -591,6 +599,7 @@
         </if-compare>
     </simple-method>
 </simple-methods>
+