svn commit: r704297 - /ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

[hansbak-2]

Author: hansbak
Date: Mon Oct 13 19:47:54 2008
New Revision: 704297

URL: http://svn.apache.org/viewvc?rev=704297&view=rev
Log:
fix a timesheet error and add a sorting on task list

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=704297&r1=704296&r2=704297&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Mon Oct 13 19:47:54 2008
@@ -299,10 +299,12 @@
         
         <!-- update the assignment status -->
         <if-compare field="parameters.checkComplete" value="Y" operator="equals">
-            <entity-one entity-name="WorkEffortPartyAssignment" value-name="alreadyAssign"/>
+            <first-from-list entry-name="alreadyAssign" list-name="assigns"/>
             <if-compare field="alreadyAssign.statusId" value="PAS_COMPLETED" operator="not-equals">
                 <set field="parameters.partyId" from-field="timesheet.partyId"/>
                 <set field="parameters.statusId" value="PAS_COMPLETED"/>
+                <set field="parameters.roleTypeId" from-field="alreadyAssign.roleTypeId"/>
+                <set field="parameters.fromDate" from-field="alreadyAssign.fromDate"/>
                 <call-simple-method method-name="updateTaskAssigment"/>
             </if-compare>
         </if-compare>
@@ -574,6 +576,8 @@
         </if-empty>
         <entity-and entity-name="ProjectAndPhaseAndTask" list-name="tasks">
             <field-map field-name="projectId" env-name="parameters.projectId"/>
+            <order-by field-name="phaseName"/>
+            <order-by field-name="workEffortName"/>
         </entity-and>        
         <if-not-empty field="tasks">
             <iterate entry-name="lowInfo" list-name="tasks">