svn commit: r786946 - /ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java

[hansbak-2]

Author: hansbak
Date: Sun Jun 21 07:19:46 2009
New Revision: 786946

URL: http://svn.apache.org/viewvc?rev=786946&view=rev
Log:
of course and we always want to select the recurring workefforts

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?rev=786946&r1=786945&r2=786946&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Sun Jun 21 07:19:46 2009
@@ -514,7 +514,14 @@
         if (filterOutCanceledEvents.booleanValue()) {
             entityExprList.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "EVENT_CANCELLED"));
         }
-        EntityConditionList<EntityCondition> ecl = EntityCondition.makeCondition(entityExprList, EntityJoinOperator.AND);
+        // always take all repeating workefforts and 'AND' all previous conditions
+        EntityConditionList<EntityCondition> ecl =
+ EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList(
+ EntityCondition.makeCondition(entityExprList, EntityJoinOperator.AND),
+ EntityCondition.makeCondition("tempExprId", EntityOperator.NOT_EQUAL, null)
+ ), EntityJoinOperator.OR);
+        
+        
         List<String> orderByList = UtilMisc.toList("estimatedStartDate");
         if (partyIdsToUse.size() > 0 || UtilValidate.isNotEmpty(facilityId) || UtilValidate.isNotEmpty(fixedAssetId)) {
             try {