[ofbiz-framework] branch trunk updated: Improved: Improvements in Find Invoice screen (OFBIZ-9643)

[akashjain]

This is an automated email from the ASF dual-hosted git repository.

akashjain pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 3f07bb8  Improved: Improvements in Find Invoice screen (OFBIZ-9643)
3f07bb8 is described below

commit 3f07bb8103107f2a653f3a3d8615a150d548b0df
Author: Akash Jain <[hidden email]>
AuthorDate: Mon Aug 3 15:57:49 2020 +0530

    Improved: Improvements in Find Invoice screen (OFBIZ-9643)
   
    Thanks, Renuka Srishti for reporting the issue.
---
 applications/accounting/widget/InvoiceForms.xml   | 11 ++++++-----
 applications/accounting/widget/InvoiceScreens.xml | 11 +++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/applications/accounting/widget/InvoiceForms.xml b/applications/accounting/widget/InvoiceForms.xml
index b141f80..b2bf804 100644
--- a/applications/accounting/widget/InvoiceForms.xml
+++ b/applications/accounting/widget/InvoiceForms.xml
@@ -21,7 +21,7 @@ under the License.
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd">
     <!-- Invoice forms -->
-    <form name="FindInvoices" type="single" target="findInvoices" title="Find and list invoices"
+    <form name="FindInvoices" type="single" target="findInvoices" title="Find and list invoices" default-map-name="parameters"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
         <field name="invoiceId"><text-find ignore-case="true"/></field>
@@ -31,12 +31,13 @@ under the License.
                 <entity-options entity-name="InvoiceType"/>
             </drop-down>
         </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
-            <check all-checked="false">
-                <entity-options entity-name="StatusItem">
+        <field name="statusId">
+            <drop-down allow-multiple="true">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
+                    <entity-order-by field-name="sequenceId"/>
                 </entity-options>
-            </check>
+            </drop-down>
         </field>
         <field position="1" name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field>
         <field position="2" name="partyIdTo" parameter-name="partyId"><lookup target-form-name="LookupPartyName"/></field>
diff --git a/applications/accounting/widget/InvoiceScreens.xml b/applications/accounting/widget/InvoiceScreens.xml
index d0168b9..766554e 100644
--- a/applications/accounting/widget/InvoiceScreens.xml
+++ b/applications/accounting/widget/InvoiceScreens.xml
@@ -77,6 +77,12 @@ under the License.
                 <set field="tabButtonItem" value="find"/>
                 <set field="titleProperty" value="PageTitleFindInvoice"/>
                 <set field="helpAnchor" value="_help_for_find_invoices"/>
+                <set field="asm_multipleSelectForm" value="FindInvoices"/>
+                <set field="asm_asmListItemPercentOfForm" value="110"/>
+                <set field="statusId.asm_multipleSelect" value="FindInvoices_statusId"/>
+                <set field="statusId.asm_sortable" value="true"/>
+                <set field="statusId.asm_title" value=" "/>
+                <set field="asm_listField[]" from-field="statusId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
@@ -89,6 +95,11 @@ under the License.
                                         <container style="clear"/>
                                     </decorator-section>
                                     <decorator-section name="search-options">
+                                        <platform-specific>
+                                            <html>
+                                                <html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/>
+                                            </html>
+                                        </platform-specific>
                                         <include-form name="FindInvoices" location="component://accounting/widget/InvoiceForms.xml"/>
                                     </decorator-section>
                                     <decorator-section name="search-results">