Author: jleroux
Date: Wed Mar 7 13:35:32 2007
New Revision: 515777
URL: http://svn.apache.org/viewvc?view=rev&rev=515777
Log:
A patch from Eriks Dobelis "Assigned tasks not shown in WorkEffort/TaskList
(not anymore)" (https://issues.apache.org/jira/browse/OFBIZ-768)
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=515777&r1=515776&r2=515777
==============================================================================
---
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
(original)
+++
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
Wed Mar 7 13:35:32 2007
@@ -70,13 +70,13 @@
new EntityExpr("currentStatusId",
EntityOperator.NOT_EQUAL, "CAL_COMPLETED"),
new EntityExpr("currentStatusId",
EntityOperator.NOT_EQUAL, "CAL_CANCELLED")),
UtilMisc.toList("priority"));
- validWorkEfforts =
delegator.findByAnd("WorkEffortAndPartyAssign",
+
validWorkEfforts.addAll(delegator.findByAnd("WorkEffortAndPartyAssign",
UtilMisc.toList(new EntityExpr("partyId",
EntityOperator.EQUALS, userLogin.get("partyId")),
new EntityExpr("workEffortTypeId",
EntityOperator.EQUALS, "PROD_ORDER_TASK"),
new EntityExpr("currentStatusId",
EntityOperator.NOT_EQUAL, "PRUN_CANCELLED "),
new EntityExpr("currentStatusId",
EntityOperator.NOT_EQUAL, "PRUN_COMPLETED"),
new EntityExpr("currentStatusId",
EntityOperator.NOT_EQUAL, "PRUN_CLOSED")),
- UtilMisc.toList("createdDate DESC"));
+ UtilMisc.toList("createdDate DESC")));
} catch (GenericEntityException e) {
Debug.logWarning(e, module);
return ServiceUtil.returnError("Error finding desired
WorkEffort records: " + e.toString());