Return-Path: 
 <commits-return-10372-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org>
Delivered-To: apmail-ofbiz-commits-archive@www.apache.org
Received: (qmail 19132 invoked from network); 10 Feb 2009 09:16:42 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 10 Feb 2009 09:16:42 -0000
Received: (qmail 93852 invoked by uid 500); 10 Feb 2009 09:15:51 -0000
Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org
Received: (qmail 93823 invoked by uid 500); 10 Feb 2009 09:15:50 -0000
Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ofbiz.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ofbiz.apache.org>
List-Post: <mailto:commits@ofbiz.apache.org>
List-Id: <commits.ofbiz.apache.org>
Reply-To: dev@ofbiz.apache.org
Delivered-To: mailing list commits@ofbiz.apache.org
Received: (qmail 93811 invoked by uid 99); 10 Feb 2009 09:15:50 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Feb 2009 01:15:50 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Feb 2009 09:15:49 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 008D62388CFA; Tue, 10 Feb 2009 09:15:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r742902 - in /ofbiz/trunk/specialpurpose/projectmgr:
 script/org/ofbiz/project/ProjectServices.xml widget/forms/ProjectForms.xml
 widget/forms/TaskForms.xml
Date: Tue, 10 Feb 2009 09:15:22 -0000
To: commits@ofbiz.apache.org
From: hansbak@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090210091528.008D62388CFA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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"