svn commit: r778928 - /ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml

[jonesde]

Author: jonesde
Date: Tue May 26 23:32:17 2009
New Revision: 778928

URL: http://svn.apache.org/viewvc?rev=778928&view=rev
Log:
Some small improvements to the ListReports page which appears to actually a report on outstanding invoices

Modified:
    ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml

Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=778928&r1=778927&r2=778928&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml Tue May 26 23:32:17 2009
@@ -21,16 +21,24 @@
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
    <!-- show list of upto 10 Invoices past due for longest duration -->
-    <form name="ListReports" type="list" separate-columns="true" title="Invoice List" list-name="listIt" target="" default-entity-name="Invoice"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+    <form name="ListReports" type="list" separate-columns="true" title="Invoice List" list-name="invoices" target="" default-entity-name="Invoice"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate="true">
         <actions>
             <entity-condition entity-name="Invoice" list="invoices">
                 <condition-list>
-                    <condition-expr field-name="statusId" value="INVOICE_SENT"/>
-                    <condition-expr field-name="dueDate" operator="less" value="${nowTimestamp}"/>
+                    <condition-expr field-name="invoiceTypeId" value="SALES_INVOICE"/>
+                    <condition-list combine="or">
+                        <condition-expr field-name="statusId" value="INVOICE_SENT"/>
+                        <condition-expr field-name="statusId" value="INVOICE_APPROVED"/>
+                    </condition-list>
+                    <condition-list combine="or">
+                        <condition-expr field-name="dueDate" operator="equals" from-field="nullField"/>
+                        <condition-expr field-name="dueDate" operator="less" value="${nowTimestamp}"/>
+                    </condition-list>
                 </condition-list>
                 <order-by field-name="dueDate"/>
-                <limit-range start="0" size="10"/>
+                <!-- <limit-range start="0" size="10"/> -->
+                <use-iterator/>
             </entity-condition>
         </actions>
         <row-actions>