You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/02/10 10:15:22 UTC
svn commit: r742902 - in /ofbiz/trunk/specialpurpose/projectmgr:
script/org/ofbiz/project/ProjectServices.xml widget/forms/ProjectForms.xml
widget/forms/TaskForms.xml
Author: hansbak
Date: Tue Feb 10 09:15:18 2009
New Revision: 742902
URL: http://svn.apache.org/viewvc?rev=742902&view=rev
Log:
add orginal hours to task and project and correct totals amount
Modified:
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.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=742902&r1=742901&r2=742902&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Feb 10 09:15:18 2009
@@ -864,6 +864,7 @@
<then>
<field-to-list field="taskParty" list="taskParties"/>
<clear-field field="taskParty"/>
+ <clear-field field="highInfo"/>
</then>
</if>
@@ -883,11 +884,12 @@
<!-- get the planned hours -->
<set field="lowInfo" from-field="task"/>
- <set field="hoursPartyId" from-field="task.partyId"/>
+ <set field="parameters.hoursPartyId" from-field="task.partyId"/>
<get-related-one value-field="task" relation-name="WorkEffort" to-value-field="lowInfo"/>
<call-simple-method method-name="getHours"/>
<set field="taskParty.plannedHours" from-field="highInfo.plannedHours" type="Double"/>
<set field="taskParty.actualHours" from-field="highInfo.actualHours" type="Double"/>
+ <set field="taskParty.originalActualHours" from-field="highInfo.originalActualHours" type="Double"/>
</iterate>
<if-not-empty field="taskParty">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=742902&r1=742901&r2=742902&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Tue Feb 10 09:15:18 2009
@@ -208,6 +208,7 @@
<field name="actualStartDate"><display type="date"/></field>
<field name="actualCompletionDate"><display type="date"/></field>
<field name="plannedHours"><display/></field>
+ <field name="originalActualHours"><display/></field>
<field name="actualHours"><display/></field>
</form>
<form name="ListChildEfforts" target="updateProjectAndAssoc" title="" list-name="projects" type="list" separate-columns="true" paginate-target="FindProject"
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=742902&r1=742901&r2=742902&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue Feb 10 09:15:18 2009
@@ -466,6 +466,7 @@
<field name="actualStartDate"><display type="date"/></field>
<field name="actualCompletionDate"><display type="date"/></field>
<field name="plannedHours"><display/></field>
+ <field name="originalActualHours"><display/></field>
<field name="actualHours"><display/></field>
</form>
<form name="EditWorkEffortPartyAssigns" target="deleteTaskPartyAssign" title="" type="list" paginate-target="EditTaskPartyAssigns"
@@ -501,6 +502,7 @@
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
+ <field name="originalActualHours"><display/></field>
<field name="actualHours"><display/></field>
</form>
<form name="ListTaskContent" type="list" paginate-target="/ListCommContent"