Author: lektran
Date: Mon Jun 25 02:08:12 2007
New Revision: 550422
URL: http://svn.apache.org/viewvc?view=rev&rev=550422
Log:
Applied fix from trunk for revision: 549034
Modified:
ofbiz/branches/release4.0/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh
Modified:
ofbiz/branches/release4.0/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh?view=diff&rev=550422&r1=550421&r2=550422
==============================================================================
---
ofbiz/branches/release4.0/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh
(original)
+++
ofbiz/branches/release4.0/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh
Mon Jun 25 02:08:12 2007
@@ -271,7 +271,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, oneProd.getString("productId")),
new EntityExpr("statusId", EntityOperator.IN,
UtilMisc.toList("ORDER_COMPLETED", "ORDER_APPROVED", "ORDER_HELD")),
new EntityExpr("orderTypeId",
EntityOperator.EQUALS, "SALES_ORDER"),
@@ -297,7 +297,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, oneProd.getString("productId")),
new EntityExpr("workEffortTypeId",
EntityOperator.EQUALS, "PROD_ORDER_TASK"),
new EntityExpr("actualCompletionDate",
EntityOperator.GREATER_THAN_EQUAL_TO, checkTime)
