[ofbiz-framework] branch trunk updated: Improved: Status ID checkbox for FindPayments and FindPurchaseInvoices forms (OFBIZ-11938)

[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 2a9c4ce  Improved: Status ID checkbox for FindPayments and FindPurchaseInvoices forms (OFBIZ-11938)
2a9c4ce is described below

commit 2a9c4ce3f4d745deacc020fca67309d86c6be12f
Author: Akash Jain <[hidden email]>
AuthorDate: Mon Aug 3 16:19:06 2020 +0530

    Improved: Status ID checkbox for FindPayments and FindPurchaseInvoices forms (OFBIZ-11938)
---
 applications/accounting/widget/PaymentForms.xml          | 6 +++---
 applications/accounting/widget/PaymentScreens.xml        | 9 +++++++++
 applications/accounting/widget/ap/InvoiceScreens.xml     | 9 +++++++++
 applications/accounting/widget/ap/forms/InvoiceForms.xml | 6 +++---
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/applications/accounting/widget/PaymentForms.xml b/applications/accounting/widget/PaymentForms.xml
index 56cc93e..cea81c4 100644
--- a/applications/accounting/widget/PaymentForms.xml
+++ b/applications/accounting/widget/PaymentForms.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">
 
-    <form name="FindPayments" type="single" target="findPayments"
+    <form name="FindPayments" type="single" target="findPayments" 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="paymentId"><text-find ignore-case="true"/></field>
@@ -34,12 +34,12 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
-            <check all-checked="false">
+            <drop-down allow-multiple="true">
                 <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PMNT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-            </check>
+            </drop-down>
         </field>
         <field position="1" name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field>
         <field position="2" name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field>
diff --git a/applications/accounting/widget/PaymentScreens.xml b/applications/accounting/widget/PaymentScreens.xml
index 460a069..13faeb3 100644
--- a/applications/accounting/widget/PaymentScreens.xml
+++ b/applications/accounting/widget/PaymentScreens.xml
@@ -67,6 +67,12 @@ under the License.
                 <set field="headerItem" value="payments"/>
                 <set field="tabButtonItem" value="findPayment"/>
                 <set field="helpAnchor" value="_help_for_find_payments"/>
+                <set field="asm_multipleSelectForm" value="FindPayments"/>
+                <set field="asm_asmListItemPercentOfForm" value="110"/>
+                <set field="statusId.asm_multipleSelect" value="FindPayments_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="CommonPaymentDecorator" location="${parameters.mainDecoratorLocation}">
@@ -82,6 +88,9 @@ under the License.
                                         </container>
                                     </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="FindPayments" location="component://accounting/widget/PaymentForms.xml"/>
                                     </decorator-section>
                                     <decorator-section name="search-results">
diff --git a/applications/accounting/widget/ap/InvoiceScreens.xml b/applications/accounting/widget/ap/InvoiceScreens.xml
index f8f344e..ac03460 100644
--- a/applications/accounting/widget/ap/InvoiceScreens.xml
+++ b/applications/accounting/widget/ap/InvoiceScreens.xml
@@ -115,6 +115,12 @@ under the License.
                     <field-map field-name="paymentMethodTypeId" value="COMPANY_CHECK"/>
                 </entity-and>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
+                <set field="asm_multipleSelectForm" value="FindPurchaseInvoices"/>
+                <set field="asm_asmListItemPercentOfForm" value="110"/>
+                <set field="statusId.asm_multipleSelect" value="FindPurchaseInvoices_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.mainDecoratorLocation}">
@@ -123,6 +129,9 @@ under the License.
                             <widgets>
                                 <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
                                     <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="FindPurchaseInvoices" location="component://accounting/widget/ap/forms/InvoiceForms.xml"/>
                                     </decorator-section>
                                     <decorator-section name="search-results">
diff --git a/applications/accounting/widget/ap/forms/InvoiceForms.xml b/applications/accounting/widget/ap/forms/InvoiceForms.xml
index e553127..578b71c 100644
--- a/applications/accounting/widget/ap/forms/InvoiceForms.xml
+++ b/applications/accounting/widget/ap/forms/InvoiceForms.xml
@@ -81,7 +81,7 @@ under the License.
         </field>
     </form>
     
-    <form name="FindPurchaseInvoices" type="single" target="FindPurchaseInvoices">
+    <form name="FindPurchaseInvoices" type="single" target="FindPurchaseInvoices" default-map-name="parameters">
         <actions>
             <set field="organizationPartyId" from-field="parameters.organizationPartyId" default-value="${defaultOrganizationPartyId}"/>
             <entity-condition entity-name="InvoiceType" list="invoiceTypeList">
@@ -93,11 +93,11 @@ under the License.
         </actions>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingVendorParty}" position="1"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
-            <check all-checked="false">
+            <drop-down allow-multiple="true">
                 <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
                 </entity-options>
-            </check>
+            </drop-down>
         </field>
         <field name="organizationPartyId"><hidden/></field>
         <field name="fromInvoiceDate" position="1"><date-time/></field>