Return-Path: 
 <commits-return-10257-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org>
Delivered-To: apmail-ofbiz-commits-archive@www.apache.org
Received: (qmail 40368 invoked from network); 4 Feb 2009 04:31:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Feb 2009 04:31:44 -0000
Received: (qmail 45870 invoked by uid 500); 4 Feb 2009 04:31:43 -0000
Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org
Received: (qmail 45845 invoked by uid 500); 4 Feb 2009 04:31:43 -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 45836 invoked by uid 99); 4 Feb 2009 04:31:43 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2009 20:31:43 -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; Wed, 04 Feb 2009 04:31:42 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 94D6E23888AF; Wed,  4 Feb 2009 04:31:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r740600 -
 /ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Date: Wed, 04 Feb 2009 04:31:22 -0000
To: commits@ofbiz.apache.org
From: hansbak@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090204043122.94D6E23888AF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hansbak
Date: Wed Feb  4 04:31:22 2009
New Revision: 740600

URL: http://svn.apache.org/viewvc?rev=740600&view=rev
Log:
improved 'not yet billed project hours' form to better check before invoicing

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=740600&r1=740599&r2=740600&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed Feb  4 04:31:22 2009
@@ -101,16 +101,22 @@
                     <condition-expr field-name="timesheetStatusId" operator="equals" value="TIMESHEET_COMPLETED"/>
                     <condition-expr field-name="fromDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/>
                 </condition-list>
-                <order-by field-name="-fromDate"/>
+                <order-by field-name="phaseName"/>
+                <order-by field-name="workEffortName"/>
+                <order-by field-name="timesheetPartyId"/>
             </entity-condition>
         </actions>
-        <field name="workEffortName"><display/></field>
-        <field name="phaseName"><display/></field>
-        <field name="timesheetId"><hyperlink description="${timesheetId}" target="Timesheet?timesheetId=${timesheetId}"/></field>
-        <field name="hours"><display/></field>
-        <field name="partyId"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity entity-name="RateType" description="${description}"/></field>
-        <field name="fromDate"><display type="date"/></field>
+        <row-actions>
+            <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get(&quot;workEffortId&quot;);return new Boolean(!(prev!=null&amp;&amp;prev.equals(workEffortId)));}" type="Boolean"/>
+        </row-actions>
+        <field name="workEffortId"><hidden/></field>
+        <field name="phaseName" position="1" use-when="showPosition1"><display/></field>
+        <field name="workEffortName" position="1" use-when="showPosition1"><display/></field>
+        <field name="timesheetId" position="2"><hyperlink description="${timesheetId}" target="Timesheet?timesheetId=${timesheetId}"/></field>
+        <field name="hours" position="2"><display/></field>
+        <field name="timesheetPartyId" position="2"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}" key-field-name="partyId"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}" position="2"><display-entity entity-name="RateType" description="${description}"/></field>
+        <field name="fromDate" position="2"><display type="date"/></field>
     </form>
     <form name="ListProjects" type="list" list-name="listIt" paginate-target="FindProject"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">