Author: ashish
Date: Tue Jun 24 05:49:39 2008
New Revision: 671158
URL:
http://svn.apache.org/viewvc?rev=671158&view=revLog:
I think we will read the partyId from the timeSheet generic value.
I noticed that we are not passing partyId (From the respective Form) to services "updateTimesheet" & "updateTimeEntryByWorkeffort".
If there is some reason for not passing partyId to the above services then please let us know.
Because we are considering that the "partyId" field from TimeEntry will contain the record entered by "Logged In" party.
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListUnBilledHoursResources.bsh
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListUnBilledHoursResources.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListUnBilledHoursResources.bsh?rev=671158&r1=671157&r2=671158&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListUnBilledHoursResources.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListUnBilledHoursResources.bsh Tue Jun 24 05:49:39 2008
@@ -49,7 +49,7 @@
// check the role of his part, if party is a provider
exprs = UtilMisc.toList(
EntityCondition.makeCondition("workEffortId", EntityOperator.EQUALS, timeEntry.getString("workEffortId")),
- EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, timeEntry.getString("partyId")),
+ EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, timesheet.getString("partyId")),
EntityCondition.makeCondition("roleTypeId", EntityOperator.LIKE, "PROVIDER_%"));
ecl = EntityCondition.makeCondition(exprs, EntityOperator.AND);
providerRoles = EntityUtil.filterByDate(delegator.findList("WorkEffortPartyAssignment", ecl, null, null, null, false));