Author: jacopoc
Date: Mon Apr 2 23:46:02 2007
New Revision: 525057
URL: http://svn.apache.org/viewvc?view=rev&rev=525057
Log:
Hidden completed and closed production runs in calendars.
Modified:
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
Modified:
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?view=diff&rev=525057&r1=525056&r2=525057
==============================================================================
---
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
(original)
+++
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
Mon Apr 2 23:46:02 2007
@@ -277,11 +277,15 @@
entityExprList.add(new EntityExpr("facilityId",
EntityOperator.EQUALS, facilityId));
typesList.add(new EntityExpr("workEffortTypeId",
EntityOperator.EQUALS, "PROD_ORDER_HEADER"));
entityExprList.add(new EntityExpr("currentStatusId",
EntityOperator.NOT_EQUAL, "PRUN_CREATED"));
+ entityExprList.add(new EntityExpr("currentStatusId",
EntityOperator.NOT_EQUAL, "PRUN_COMPLETED"));
+ entityExprList.add(new EntityExpr("currentStatusId",
EntityOperator.NOT_EQUAL, "PRUN_CLOSED"));
}
if (UtilValidate.isNotEmpty(fixedAssetId)) {
entityExprList.add(new EntityExpr("fixedAssetId",
EntityOperator.EQUALS, fixedAssetId));
typesList.add(new EntityExpr("workEffortTypeId",
EntityOperator.EQUALS, "PROD_ORDER_TASK"));
entityExprList.add(new EntityExpr("currentStatusId",
EntityOperator.NOT_EQUAL, "PRUN_CREATED"));
+ entityExprList.add(new EntityExpr("currentStatusId",
EntityOperator.NOT_EQUAL, "PRUN_COMPLETED"));
+ entityExprList.add(new EntityExpr("currentStatusId",
EntityOperator.NOT_EQUAL, "PRUN_CLOSED"));
}
EntityCondition typesCondition = null;
if (typesList.size() == 1) {
