svn commit: r1420569 - in /ofbiz/trunk/applications: order/src/org/ofbiz/order/order/OrderServices.java workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy

[hansbak]

Author: hansbak
Date: Wed Dec 12 08:34:23 2012
New Revision: 1420569

URL: http://svn.apache.org/viewvc?rev=1420569&view=rev
Log:
make reserved hotel rooms appear on the fixed asset calendar

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
    
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy

Modified: 
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1420569&r1=1420568&r2=1420569&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java 
(original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java 
Wed Dec 12 08:34:23 2012
@@ -720,6 +720,7 @@ public class OrderServices {
                 String workEffortId = delegator.getNextSeqId("WorkEffort"); // 
find next available workEffortId
                 workEffort.set("workEffortId", workEffortId);
                 workEffort.set("workEffortTypeId", "ASSET_USAGE");
+                workEffort.set("currentStatusId", "_NA_"); // a lot of 
workefforts selection services expect a value here....
                 toBeStored.add(workEffort);  // store workeffort before 
workOrderItemFulfillment because of workEffortId key constraint
                 // workOrderItemFulfillment
                 workOrderItemFulfillment.set("workEffortId", workEffortId);

Modified: 
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy?rev=1420569&r1=1420568&r2=1420569&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy
 (original)
+++ 
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy
 Wed Dec 12 08:34:23 2012
@@ -58,7 +58,7 @@ if (followingMonthDays < 0) {
 }
 numDays += followingMonthDays; 
 Map serviceCtx = 
dispatcher.getDispatchContext().makeValidContext("getWorkEffortEventsByPeriod", 
"IN", parameters);
-serviceCtx.putAll(UtilMisc.toMap("userLogin", userLogin, "start", getFrom, 
"numPeriods", numDays, "periodType", Calendar.DATE, "locale", locale, 
"timeZone", timeZone));
+serviceCtx.putAll(UtilMisc.toMap("userLogin", userLogin, "start", getFrom, 
"calendarType", "VOID", "numPeriods", numDays, "periodType", Calendar.DATE, 
"locale", locale, "timeZone", timeZone));
 if (context.entityExprList) {
     serviceCtx.entityExprList = entityExprList;
 }