Author: lektran
Date: Mon Jun 25 02:05:34 2007
New Revision: 550421
URL: http://svn.apache.org/viewvc?view=rev&rev=550421
Log:
Applied fix from trunk for revision: 549024
Modified:
ofbiz/branches/release4.0/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
Modified:
ofbiz/branches/release4.0/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?view=diff&rev=550421&r1=550420&r2=550421
==============================================================================
---
ofbiz/branches/release4.0/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
(original)
+++
ofbiz/branches/release4.0/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
Mon Jun 25 02:05:34 2007
@@ -918,7 +918,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"),
@@ -956,7 +956,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)
