svn commit: r718737 - /ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalendarWorker.java

[adrianc]

Author: adrianc
Date: Tue Nov 18 14:18:55 2008
New Revision: 718737

URL: http://svn.apache.org/viewvc?rev=718737&view=rev
Log:
Small fixup for my last commit.

Modified:
    ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalendarWorker.java

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalendarWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalendarWorker.java?rev=718737&r1=718736&r2=718737&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalendarWorker.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalendarWorker.java Tue Nov 18 14:18:55 2008
@@ -82,11 +82,12 @@
         EntityCondition workEffortCond = EntityCondition.makeCondition(conditionList);
         for (GenericValue partyValue : relatedParties) {
             variableExpr.init("partyId", EntityOperator.EQUALS, partyValue.get("partyId"));
-            workEfforts.addAll(delegator.findList("WorkEffortAndPartyAssign", workEffortCond, null, null, null, false));
+            workEfforts.addAll(EntityUtil.filterByDate(delegator.findList("WorkEffortAndPartyAssign", workEffortCond, null, null, null, false)));
         }
         for (GenericValue fixedAssetValue : relatedFixedAssets) {
             variableExpr.init("fixedAssetId", EntityOperator.EQUALS, fixedAssetValue.get("fixedAssetId"));
-            workEfforts.addAll(delegator.findList("WorkEffortAndPartyAssign", workEffortCond, null, null, null, false));
+            workEfforts.addAll(delegator.findList("WorkEffort", workEffortCond, null, null, null, false));
+            workEfforts.addAll(EntityUtil.filterByDate(delegator.findList("WorkEffortAndFixedAssetAssign", workEffortCond, null, null, null, false)));
         }
         workEfforts.addAll(EntityUtil.filterByDate(delegator.findList("WorkEffortAssocToView", EntityCondition.makeCondition("workEffortIdFrom", EntityOperator.EQUALS, workEffortId), null, null, null, false)));
         return WorkEffortWorker.removeDuplicateWorkEfforts(workEfforts);