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

[jacopoc]

Author: jacopoc
Date: Tue Apr 29 16:51:23 2008
New Revision: 652190

URL: http://svn.apache.org/viewvc?rev=652190&view=rev
Log:
Fix for bug I introduced while refactoring the inventory reservation service to improve its performance.

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?rev=652190&r1=652189&r2=652190&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Tue Apr 29 16:51:23 2008
@@ -84,8 +84,8 @@
                 <entity-condition entity-name="InventoryItemAndLocation" list-name="inventoryItemAndLocations">
                     <condition-list combine="and">
                         <condition-expr field-name="productId" env-name="parameters.productId"/>
-                        <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-null="true"/>
-                        <condition-expr field-name="containerId" env-name="parameters.containerId" ignore-if-null="true"/>
+                        <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/>
+                        <condition-expr field-name="containerId" env-name="parameters.containerId" ignore-if-empty="true" ignore-if-null="true"/>
                         <condition-expr field-name="quantityOnHandTotal" operator="greater" value="0.0"/>
                         <condition-expr field-name="locationTypeEnumId" operator="equals" value="FLT_PICKLOC"/>
                     </condition-list>
@@ -104,8 +104,8 @@
                     <entity-condition entity-name="InventoryItemAndLocation" list-name="inventoryItemAndLocations">
                         <condition-list combine="and">
                             <condition-expr field-name="productId" env-name="parameters.productId"/>
-                            <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-null="true"/>
-                            <condition-expr field-name="containerId" env-name="parameters.containerId" ignore-if-null="true"/>
+                            <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/>
+                            <condition-expr field-name="containerId" env-name="parameters.containerId" ignore-if-empty="true" ignore-if-null="true"/>
                             <condition-expr field-name="quantityOnHandTotal" operator="greater" value="0.0"/>
                             <condition-expr field-name="locationTypeEnumId" operator="equals" value="FLT_BULK"/>
                         </condition-list>
@@ -125,8 +125,8 @@
                     <entity-condition entity-name="InventoryItem" list-name="inventoryItems">
                         <condition-list combine="and">
                             <condition-expr field-name="productId" env-name="parameters.productId"/>
-                            <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-null="true"/>
-                            <condition-expr field-name="containerId" env-name="parameters.containerId" ignore-if-null="true"/>
+                            <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/>
+                            <condition-expr field-name="containerId" env-name="parameters.containerId" ignore-if-empty="true" ignore-if-null="true"/>
                             <condition-expr field-name="quantityOnHandTotal" operator="greater" value="0.0"/>
                             <condition-expr field-name="locationSeqId" operator="equals" env-name="nullField"/>
                         </condition-list>