svn commit: r703758 - /ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy

[adrianc]

Author: adrianc
Date: Sat Oct 11 18:48:14 2008
New Revision: 703758

URL: http://svn.apache.org/viewvc?rev=703758&view=rev
Log:
Removed constraints from fixed asset calendar. Now shows all work efforts for the fixed asset.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy?rev=703758&r1=703757&r2=703758&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy Sat Oct 11 18:48:14 2008
@@ -78,15 +78,14 @@
     globalContext.end = end;
 }
 
-entityExprList = [EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_CANCELLED"),
-    EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "TASK"), EntityCondition.makeCondition("workEffortPurposeTypeId", EntityOperator.EQUALS, "WEPT_MAINTENANCE")];
+entityExprList = [EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_CANCELLED")];
 fixedAssetId = parameters.fixedAssetId;
 if (fixedAssetId) {
     entityExprList.add(EntityCondition.makeCondition("fixedAssetId", EntityOperator.EQUALS, fixedAssetId));
     globalContext.fixedAssetId = fixedAssetId;
     globalContext.addlParam = "&fixedAssetId=" + fixedAssetId;
 }
-serviceCtx = [userLogin : userLogin, start : getFrom, numPeriods : numPeriods, periodType : periodType];
+serviceCtx = [userLogin : userLogin, start : getFrom, numPeriods : numPeriods, periodType : periodType, fixedAssetId : fixedAssetId];
 serviceCtx.putAll([entityExprList : entityExprList, locale : locale, timeZone : timeZone]);
 result = dispatcher.runSync("getWorkEffortEventsByPeriod", serviceCtx);
 globalContext.periods = result.periods;