svn commit: r801893 - in /ofbiz/trunk/applications/accounting: webapp/ap/invoices/CommissionRun.ftl widget/ap/forms/InvoiceForms.xml

[apatel-2]

Author: apatel
Date: Fri Aug  7 06:39:35 2009
New Revision: 801893

URL: http://svn.apache.org/viewvc?rev=801893&view=rev
Log:
Simple UI enhancements to commissionrun process screens. Thanks Rishi, Arpit for contribution.

Modified:
    ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl
    ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml

Modified: ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl?rev=801893&r1=801892&r2=801893&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl Fri Aug  7 06:39:35 2009
@@ -89,13 +89,14 @@
     <table class="basic-table hover-bar" cellspacing="0">
       <#-- Header Begins -->
       <tr class="header-row-2">
-        <td width="10%"><input type="checkbox" id="checkAllInvoices" name="checkAllInvoices" onchange="javascript:toggleInvoiceId(this);"/> ${uiLabelMap.CommonSelectAll}</td>
-        <td width="10%">${uiLabelMap.FormFieldTitle_invoiceId}</td>
-        <td width="10%">${uiLabelMap.AccountingVendorParty}</td>
-        <td width="8%">${uiLabelMap.CommonStatus}</td>
-        <td width="10%">${uiLabelMap.AccountingReferenceNumber}</td>
-        <td width="15%">${uiLabelMap.CommonDescription}</td>
-        <td width="10%">${uiLabelMap.AccountingInvoiceDate}</td>
+        <td width="9%"><input type="checkbox" id="checkAllInvoices" name="checkAllInvoices" onchange="javascript:toggleInvoiceId(this);"/> ${uiLabelMap.CommonSelectAll}</td>
+        <td width="6%">${uiLabelMap.FormFieldTitle_invoiceId}</td>
+        <td width="10%">${uiLabelMap.AccountingFromParty}</td>
+        <td width="14%">${uiLabelMap.AccountingToParty}</td>
+        <td width="4%">${uiLabelMap.CommonStatus}</td>
+        <td width="9%">${uiLabelMap.AccountingReferenceNumber}</td>
+        <td width="12%">${uiLabelMap.CommonDescription}</td>
+        <td width="9%">${uiLabelMap.AccountingInvoiceDate}</td>
         <td width="8%">${uiLabelMap.AccountingDueDate}</td>
         <td width="8%">${uiLabelMap.AccountingAmount}</td>
         <td width="8%">${uiLabelMap.FormFieldTitle_paidAmount}</td>
@@ -111,6 +112,7 @@
           <td><input type="checkbox" id="invoiceId_${invoice_index}" name="invoiceIds" value="${invoice.invoiceId}" onclick="javascript:enableSubmitButton();"/></td>
           <td><a class="buttontext" href="<@ofbizUrl>invoiceOverview?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td>
           <td>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.partyIdFrom, false)?if_exists}</td>
+          <td>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, invoice.invoiceRolePartyId, false)?if_exists}</td>
           <td>${statusItem.get("description")?if_exists}</td>
           <td>${invoice.get("referenceNumber")?if_exists}</td>
           <td>${invoice.get("description")?if_exists}</td>

Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=801893&r1=801892&r2=801893&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Fri Aug  7 06:39:35 2009
@@ -150,8 +150,8 @@
 
     <form name="CommissionRun" type="single" target="CommissionRun">
         <field name="partyIds" field-name="partyId" title="${uiLabelMap.PartyPartyId}">
-            <drop-down allow-multiple="true">
-                <entity-options entity-name="PartyRole" description="${partyId}">
+            <drop-down allow-multiple="true" allow-empty="true">
+                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${middleName} ${lastName} ${groupName}(${partyId})">
                     <entity-constraint name="roleTypeId" operator="equals" value="SALES_REP"/>
                 </entity-options>
             </drop-down>