svn commit: r549024 - /ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java

[jacopoc]

Author: jacopoc
Date: Wed Jun 20 02:29:36 2007
New Revision: 549024

URL: http://svn.apache.org/viewvc?view=rev&rev=549024
Log:
Fixed bad code that was using hardcoded "WebStoreWarehouse" in conditions, incidentally found.

Modified:
    ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?view=diff&rev=549024&r1=549023&r2=549024
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Wed Jun 20 02:29:36 2007
@@ -920,7 +920,7 @@
                 salesUsageIt = delegator.findListIteratorByCondition(salesUsageViewEntity,
                         new EntityConditionList(
                             UtilMisc.toList(
-                                new EntityExpr("facilityId", EntityOperator.EQUALS, "WebStoreWarehouse"),
+                                new EntityExpr("facilityId", EntityOperator.EQUALS, facilityId),
                                 new EntityExpr("productId", EntityOperator.EQUALS, productId),
                                 new EntityExpr("statusId", EntityOperator.IN, UtilMisc.toList("ORDER_COMPLETED", "ORDER_APPROVED", "ORDER_HELD")),
                                 new EntityExpr("orderTypeId", EntityOperator.EQUALS, "SALES_ORDER"),
@@ -958,7 +958,7 @@
                 productionUsageIt = delegator.findListIteratorByCondition(productionUsageViewEntity,
                         new EntityConditionList(
                             UtilMisc.toList(
-                                new EntityExpr("facilityId", EntityOperator.EQUALS, "WebStoreWarehouse"),
+                                new EntityExpr("facilityId", EntityOperator.EQUALS, facilityId),
                                 new EntityExpr("productId", EntityOperator.EQUALS, productId),
                                 new EntityExpr("workEffortTypeId", EntityOperator.EQUALS, "PROD_ORDER_TASK"),
                                 new EntityExpr("actualCompletionDate", EntityOperator.GREATER_THAN_EQUAL_TO, checkTime)