[OFBiz] SVN: r6880 - in trunk/applications/accounting: webapp/accounting widget

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-03-01 18:25:15 -0600 (Wed, 01 Mar 2006)
New Revision: 6880

Modified:
   trunk/applications/accounting/webapp/accounting/main.ftl
   trunk/applications/accounting/widget/CommonScreens.xml
Log:
Fixed list of payment and invoice types available on the initial screen

Modified: trunk/applications/accounting/webapp/accounting/main.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/main.ftl	2006-03-02 00:13:05 UTC (rev 6879)
+++ trunk/applications/accounting/webapp/accounting/main.ftl	2006-03-02 00:25:15 UTC (rev 6880)
@@ -72,8 +72,9 @@
 
 <td>
 <ul>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=SALES_INVOICE</@ofbizUrl>">Show Sales Invoices</a></li>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=PURCHASE_INVOICE</@ofbizUrl>">Show Purchases Invoices</a></li>
+<#list invoiceTypes as invoiceType>
+<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">Show ${invoiceType.description} Invoices</a></li>
+</#list>
 </ul>
 </td>
 <td>
@@ -95,7 +96,16 @@
 <li><a href="<@ofbizUrl>findPayments?lookupFlag=Y</@ofbizUrl>">Show all Payments</a></li>
 </ul>
 </td>
+<td>
 
+<ul>
+<#list paymentTypes as paymentType>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">Show ${paymentType.get("description",locale)} Payments</a></li>
+</#list>
+</ul>
+</td>
+
+
 <td>
 <ul>
 <#list paymentMethodTypes as paymentMethodType>

Modified: trunk/applications/accounting/widget/CommonScreens.xml
===================================================================
--- trunk/applications/accounting/widget/CommonScreens.xml	2006-03-02 00:13:05 UTC (rev 6879)
+++ trunk/applications/accounting/widget/CommonScreens.xml	2006-03-02 00:25:15 UTC (rev 6880)
@@ -260,6 +260,12 @@
         <section>
             <actions>
                 <set field="headerItem" value="main"/>
+                <entity-condition entity-name="PaymentType" list-name="paymentTypes">
+                	<order-by field-name="paymentTypeId"/>
+                </entity-condition>
+                <entity-condition entity-name="InvoiceType" list-name="invoiceTypes">
+                	<order-by field-name="invoiceTypeId"/>
+                </entity-condition>                
                 <entity-condition entity-name="PaymentMethodType" list-name="paymentMethodTypes">
                 	<order-by field-name="paymentMethodTypeId"/>
                 </entity-condition>