From d9ab3dc402d7b3f43d8229184e62493a015cf046 Mon Sep 17 00:00:00 2001
From: Pierre Smits <pierre.smits@orrtiz.com>
Date: Tue, 16 Nov 2021 14:15:01 +0100
Subject: [PATCH] Improved: Invoice Payments for user with 'VIEW' permission
 (OFBIZ-12384)

renamed CreateApplicationList.groovy to InvoicePayments.groovy
adjusted reference in acc-invoices.adoc regarding invoice payments
renamed HELP_editInvoiceApplications.adoc to HELP_invoicePayments.adoc

AccountingMenus.xml:
- changed menu-item for invoice payments (name and label and link for better perception alignment)
InvoiceScreens.xml:
re screen InvoiceOverview
- removed redundant property-map references
- adjusted groovy script reference to new file name.
- removed link definitions in screenlets (duplicate of menu-items related to the invoice)
- adjusted references to invoice payment definitions in InvoiceForms.xml for better perception alignment
re screen for invoice payment
- renamed screen from 'InvoiceApplication' to 'InvoicePayments'
- adjusted references to titleProperty, tabButtonItem and helpAnchor for better perception alignment
- adjusted groovy script reference to new file name.
- added conditions for CREATE and UPDATE permission to the start section
- adjusted reference to the form (grid) to update existing invoice payments (for users with CREATE or UPDATE Permissions)
- adjusted reference to the form (grid) for invoice payments (for users with CREATE or UPDATE Permissions)

InvoiceForms.xml
- renamed 'ListInvoiceApplications' to 'InvoiceOverviewApplications. Changed from form definition to grid definition, adjusted field order.
- renamed 'EditInvoiceApplications' to 'InvoicePayments' for user with VIEW permission. Changed from form definition to grid definition. adjusted field order.
- added 'UpdateInvoicePayments for user with 'CREATE' or 'UPDATE' permissions.

controller.xml
- adjusted requests related to invoice payments for better perception alignment
- renamed view-map related to invoice payments for better perception alignment.
---
 .../accounting/config/AccountingUiLabels.xml  |  6 +-
 ...tionList.groovy => InvoicePayments.groovy} |  0
 ...cations.adoc => HELP_invoicePayments.adoc} |  0
 .../docs/asciidoc/_include/acc-invoices.adoc  |  2 +-
 .../webapp/accounting/WEB-INF/controller.xml  | 18 +++---
 .../accounting/widget/AccountingMenus.xml     |  4 +-
 .../accounting/widget/InvoiceForms.xml        | 42 +++++++++-----
 .../accounting/widget/InvoiceScreens.xml      | 57 +++++++------------
 8 files changed, 61 insertions(+), 68 deletions(-)
 rename applications/accounting/groovyScripts/invoice/{CreateApplicationList.groovy => InvoicePayments.groovy} (100%)
 rename applications/accounting/src/docs/asciidoc/_include/{HELP_editInvoiceApplications.adoc => HELP_invoicePayments.adoc} (100%)

diff --git a/applications/accounting/config/AccountingUiLabels.xml b/applications/accounting/config/AccountingUiLabels.xml
index 7514b78e949..a4eb1482ddd 100644
--- a/applications/accounting/config/AccountingUiLabels.xml
+++ b/applications/accounting/config/AccountingUiLabels.xml
@@ -24357,16 +24357,16 @@
         <value xml:lang="es">Listas de Roles de Presupuesto</value>
         <value xml:lang="zh">预算角色列表</value>
     </property>
-    <property key="PageTitleListEditInvoiceApplications">
+    <property key="PageTitleInvoicePayments">
         <value xml:lang="ar">قائمة تطبيقات تعديل الفاتورة</value>
         <value xml:lang="de">Rechnungszuordnungen auflisten</value>
-        <value xml:lang="en">List Edit Invoice Applications</value>
+        <value xml:lang="en">Invoice Payments</value>
         <value xml:lang="es">Lista Editar Aplicaciones de Factura</value>
         <value xml:lang="fr">Liste des assignations à la facture</value>
         <value xml:lang="hi-IN">संपादित चालान अनुप्रयोग की सूची</value>
         <value xml:lang="it">Aggiorna Applicazioni Fattura</value>
         <value xml:lang="ja">請求編集申請一覧</value>
-        <value xml:lang="nl">Toon edit factuurtoewijzingen</value>
+        <value xml:lang="nl">Factuurbetalingen</value>
         <value xml:lang="pt">Listar Edições das Apliicações de Fatura</value>
         <value xml:lang="ro">Actualizeaza Aplicatii Factura</value>
         <value xml:lang="ru">Список ред. приложений накл.</value>
diff --git a/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy b/applications/accounting/groovyScripts/invoice/InvoicePayments.groovy
similarity index 100%
rename from applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy
rename to applications/accounting/groovyScripts/invoice/InvoicePayments.groovy
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_editInvoiceApplications.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_invoicePayments.adoc
similarity index 100%
rename from applications/accounting/src/docs/asciidoc/_include/HELP_editInvoiceApplications.adoc
rename to applications/accounting/src/docs/asciidoc/_include/HELP_invoicePayments.adoc
diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-invoices.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-invoices.adoc
index 8a2c0bc9c7c..01230652a0c 100644
--- a/applications/accounting/src/docs/asciidoc/_include/acc-invoices.adoc
+++ b/applications/accounting/src/docs/asciidoc/_include/acc-invoices.adoc
@@ -56,7 +56,7 @@ include::HELP_editInvoice.adoc[leveloffset=+2]
 
 include::HELP_newInvoice.adoc[leveloffset=+2]
 
-include::HELP_editInvoiceApplications.adoc[leveloffset=+2]
+include::HELP_invoicePayments.adoc[leveloffset=+2]
 
 include::HELP_listInvoiceItems.adoc[leveloffset=+2]
 
diff --git a/applications/accounting/webapp/accounting/WEB-INF/controller.xml b/applications/accounting/webapp/accounting/WEB-INF/controller.xml
index 9e56720ddaa..9d01385b5c3 100644
--- a/applications/accounting/webapp/accounting/WEB-INF/controller.xml
+++ b/applications/accounting/webapp/accounting/WEB-INF/controller.xml
@@ -213,21 +213,21 @@ under the License.
         <response name="success" type="view" value="editInvoiceTimeEntries"/>
         <response name="error" type="view" value="editInvoiceTimeEntries"/>
     </request-map>
-    <request-map uri="editInvoiceApplications">
+    <request-map uri="invoicePayments">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="editInvoiceApplications"/>
+        <response name="success" type="view" value="invoicePayments"/>
     </request-map>
-    <request-map uri="updateInvoiceApplication">
+    <request-map uri="updateInvoicePayment">
         <security https="true" auth="true"/>
         <event type="service" invoke="updatePaymentApplicationDef"/>
-        <response name="success" type="view" value="editInvoiceApplications"/>
-        <response name="error" type="view" value="editInvoiceApplications"/>
+        <response name="success" type="view" value="invoicePayments"/>
+        <response name="error" type="view" value="invoicePayments"/>
     </request-map>
-    <request-map uri="removeInvoiceApplication">
+    <request-map uri="removeInvoicePayment">
         <security https="true" auth="true"/>
         <event type="service" invoke="removePaymentApplication"/>
-        <response name="success" type="view" value="editInvoiceApplications"/>
-        <response name="error" type="view" value="editInvoiceApplications"/>
+        <response name="success" type="view" value="invoicePayments"/>
+        <response name="error" type="view" value="invoicePayments"/>
     </request-map>
     <request-map uri="invoiceStatus">
         <security https="true" auth="true"/>
@@ -2627,7 +2627,7 @@ under the License.
     <view-map name="listInvoiceItems" type="screen" page="component://accounting/widget/InvoiceScreens.xml#EditInvoiceItems"/>
     <view-map name="editInvoiceTimeEntries" type="screen" page="component://accounting/widget/InvoiceScreens.xml#EditInvoiceTimeEntries"/>
     <view-map name="invoiceStatus" type="screen" page="component://accounting/widget/InvoiceScreens.xml#InvoiceStatus"/>
-    <view-map name="editInvoiceApplications" type="screen" page="component://accounting/widget/InvoiceScreens.xml#EditInvoiceApplications"/>
+    <view-map name="invoicePayments" type="screen" page="component://accounting/widget/InvoiceScreens.xml#InvoicePayments"/>
     <view-map name="invoiceRoles" type="screen" page="component://accounting/widget/InvoiceScreens.xml#InvoiceRoles"/>
     <view-map name="invoiceTerms" type="screen" page="component://accounting/widget/InvoiceScreens.xml#InvoiceTerms"/>
     <view-map name="sendPerEmail" type="screen" page="component://accounting/widget/InvoiceScreens.xml#SendPerEmail"/>
diff --git a/applications/accounting/widget/AccountingMenus.xml b/applications/accounting/widget/AccountingMenus.xml
index 4f2f8a1510a..50503afc918 100644
--- a/applications/accounting/widget/AccountingMenus.xml
+++ b/applications/accounting/widget/AccountingMenus.xml
@@ -171,7 +171,7 @@ under the License.
                 <parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
             </link>
         </menu-item>
-        <menu-item name="editInvoiceApplications" title="${uiLabelMap.AccountingApplications}">
+        <menu-item name="invoicePayments" title="${uiLabelMap.CommonPayments}">
             <condition>
                 <and>
                     <not><if-empty field="invoice.invoiceId"/></not>
@@ -183,7 +183,7 @@ under the License.
                     </or>
                 </and>
             </condition>
-            <link target="editInvoiceApplications">
+            <link target="invoicePayments">
                 <parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
             </link>
         </menu-item>
diff --git a/applications/accounting/widget/InvoiceForms.xml b/applications/accounting/widget/InvoiceForms.xml
index 48b81c9a545..c6fabb223cf 100644
--- a/applications/accounting/widget/InvoiceForms.xml
+++ b/applications/accounting/widget/InvoiceForms.xml
@@ -188,23 +188,22 @@ under the License.
         <field name="datetimePerformed"><display/></field>
     </form>
 
-    <form name="ListInvoiceApplications" type="list"  list-name="invoiceApplications" default-entity-name="InvoiceItem" use-row-submit="true"
+    <grid name="InvoiceOverviewPayments"  list-name="invoiceApplications" default-entity-name="InvoiceItem" use-row-submit="true"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
         target="updatePaymentApplication" title="Apply payments to invoices" separate-columns="false">
-        <field name="invoiceItemSeqId"><display/></field>
-        <field name="productId"><display/></field>
-        <field name="description" encode-output="false"><display/></field>
-        <field name="total" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field>
         <field name="invoiceId"><hidden/></field>
+        <field name="billingAccountId"><hidden/></field>
+        <field name="paymentApplicationId"><hidden/></field>
         <field name="paymentId" widget-style="linktext">
             <hyperlink description="${paymentId}" target="paymentOverview">
                 <parameter param-name="paymentId"/>
             </hyperlink>
         </field>
-        <field name="billingAccountId"><hidden/></field>
-        <field name="paymentApplicationId"><hidden/></field>
+        <field name="invoiceItemSeqId"><display/></field>
+        <field name="productId"><display/></field>
+        <field name="total" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field>
         <field name="amountApplied" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field>
-    </form>
+    </grid>
     <form name="AcctgTransAndEntries" type="list" title="Accounting Transactions" list-name="acctgTransAndEntries"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="AcctgTransAndEntries" default-field-type="display"/>
@@ -501,30 +500,43 @@ under the License.
         <field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     
-    <form name="EditInvoiceApplications" type="list"  list-name="invoiceApplications" default-entity-name="InvoiceItem" use-row-submit="true" target="updateInvoiceApplication" title="Apply payments to invoices" separate-columns="true"
+    <grid name="InvoicePayments" list-name="invoiceApplications" default-entity-name="InvoiceItem" use-row-submit="true" separate-columns="true"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="invoiceId"><hidden/></field>
         <field name="statusId"><hidden/></field>
         <field name="paymentApplicationId"><hidden/></field>
+        <field name="billingAccountId"><hidden/></field>
+        <field name="paymentId"><display/></field>
+        <field name="description"><display/></field>
         <field name="invoiceItemSeqId"><display/></field>
         <field name="productId"><display/></field>
-        <field name="description"><display/></field>
         <field name="total"><display type="currency" currency="${invoice.currencyUomId}"/></field>
+        <field name="amountToApply" disabled="true"><display type="currency" currency="${invoice.currencyUomId}"/></field>
+    </grid>
+    <grid name="UpdateInvoicePayments" list-name="invoiceApplications" default-entity-name="InvoiceItem" use-row-submit="true" target="updateInvoicePayment" title="Apply payments to invoices" separate-columns="true"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="invoiceId"><hidden/></field>
-        <field name="paymentId"><lookup target-form-name="LookupPayment"/></field>
+        <field name="statusId"><hidden/></field>
+        <field name="paymentApplicationId"><hidden/></field>
         <field name="billingAccountId"><hidden/></field>
+        <field name="paymentId"><lookup target-form-name="LookupPayment"/></field>
+        <field name="description"><display/></field>
+        <field name="invoiceItemSeqId"><display/></field>
+        <field name="productId"><display/></field>
+        <field name="total"><display type="currency" currency="${invoice.currencyUomId}"/></field>
         <field name="amountToApply" disabled="true"><text size="10"/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <field name="removeButton" title=" " widget-style="buttontext" use-when="paymentApplicationId!=null">
-            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeInvoiceApplication">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeInvoicePayment">
                 <parameter param-name="paymentApplicationId"/>
                 <parameter param-name="invoiceId"/>
                 <parameter param-name="viewIndex"/>
                 <parameter param-name="viewSize"/>
             </hyperlink>
         </field>
-    </form>
+    </grid>
 
-    <form name="AddPayment" type="single" target="updateInvoiceApplication" title=""
+    <form name="AddPayment" type="single" target="updateInvoicePayment" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <field name="invoiceId"><hidden/></field>
         <field name="paymentId"><lookup target-form-name="LookupPayment"/></field>
@@ -535,7 +547,7 @@ under the License.
         </field>
     </form>
 
-    <form name="ListPaymentsNotApplied" type="list" list-name="payments" target="updateInvoiceApplication" title=""
+    <form name="ListPaymentsNotApplied" type="list" list-name="payments" target="updateInvoicePayment" title=""
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="invoiceId"><hidden/></field>
         <field name="paymentId" widget-style="buttontext">
diff --git a/applications/accounting/widget/InvoiceScreens.xml b/applications/accounting/widget/InvoiceScreens.xml
index 312fc311c31..86e329f8b23 100644
--- a/applications/accounting/widget/InvoiceScreens.xml
+++ b/applications/accounting/widget/InvoiceScreens.xml
@@ -182,8 +182,6 @@ under the License.
     <screen name="invoiceOverview">
         <section>
             <actions>
-                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="PageTitleInvoiceOverview"/>
                 <set field="tabButtonItem" value="invoiceOverview"/>
                 <set field="helpAnchor" value="_help_for_invoice_overview"/>
@@ -205,7 +203,7 @@ under the License.
                     <field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
                     <order-by field-name="invoiceItemSeqId"/>
                 </entity-and>
-                <script location="component://accounting/groovyScripts/invoice/CreateApplicationList.groovy"/>
+                <script location="component://accounting/groovyScripts/invoice/InvoicePayments.groovy"/>
                 <set field="parameters.statusId" from-field="invoice.statusId"/>
                 <set field="invoiceAmount" value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/>
                 <set field="notAppliedAmount" value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/>
@@ -234,9 +232,6 @@ under the License.
                             </condition>
                             <widgets>
                                 <screenlet title="${uiLabelMap.AccountingInvoiceHeader}">
-                                    <link target="editInvoice" text="${uiLabelMap.CommonUpdate}" style="buttontext">
-                                        <parameter param-name="invoiceId"/>
-                                    </link>
                                     <include-form name="InvoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/>
                                 </screenlet>
                                 <container style="lefthalf">
@@ -244,37 +239,21 @@ under the License.
                                         <include-form name="ListInvoiceStatus" location="component://accounting/widget/InvoiceForms.xml"/>
                                     </screenlet>
                                     <screenlet title="${uiLabelMap.AccountingAppliedPayments} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"
-                                        navigation-form-name="ListInvoiceApplications">
-                                        <link target="editInvoiceApplications" text="${uiLabelMap.CommonUpdate}" style="buttontext">
-                                            <parameter param-name="invoiceId"/>
-                                        </link>
-                                        <include-form name="ListInvoiceApplications" location="component://accounting/widget/InvoiceForms.xml"/>
+                                        navigation-form-name="InvoiceOverviewPayments">
+                                        <include-grid name="InvoiceOverviewPayments" location="component://accounting/widget/InvoiceForms.xml"/>
                                     </screenlet>
                                 </container>
                                 <container style="righthalf">
                                     <screenlet title="${uiLabelMap.AccountingInvoiceRoles}" navigation-form-name="InvoiceRoles">
-                                        <container>
-                                            <link target="invoiceRoles" text="${uiLabelMap.CommonUpdate}" style="buttontext">
-                                                <parameter param-name="invoiceId"/>
-                                            </link>
-                                        </container>
                                         <include-form name="InvoiceRoles" location="component://accounting/widget/InvoiceForms.xml"/>
                                     </screenlet>
                                     <screenlet title="${uiLabelMap.PartyTerms}">
-                                        <container>
-                                            <link target="invoiceTerms" text="${uiLabelMap.CommonUpdate}" style="buttontext">
-                                                <parameter param-name="invoiceId"/>
-                                            </link>
-                                        </container>
                                         <include-form name="ListInvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/>
                                         <include-form name="ListInvoicePaymentInfo" location="component://accounting/widget/InvoiceForms.xml"/>
                                     </screenlet>
                                 </container>
                                 <container style="clear"/>
                                 <screenlet title="${uiLabelMap.AccountingInvoiceItems}" navigation-form-name="InvoiceItems">
-                                    <link target="listInvoiceItems" text="${uiLabelMap.CommonUpdate}" style="buttontext">
-                                        <parameter param-name="invoiceId"/>
-                                    </link>
                                     <include-form name="InvoiceItems" location="component://accounting/widget/InvoiceForms.xml"/>
                                 </screenlet>
                                 <section>
@@ -283,9 +262,6 @@ under the License.
                                     </condition>
                                     <widgets>
                                         <screenlet title="${uiLabelMap.AccountingInvoiceTimeEntries}" navigation-form-name="ListTimeEntries">
-                                            <link target="editInvoiceTimeEntries" text="${uiLabelMap.CommonUpdate}" style="buttontext">
-                                                <parameter param-name="invoiceId"/>
-                                            </link>
                                             <include-form name="ListTimeEntries" location="component://accounting/widget/InvoiceForms.xml"/>
                                         </screenlet>
                                     </widgets>
@@ -303,8 +279,8 @@ under the License.
                                         <include-form name="ListInvoiceStatus" location="component://accounting/widget/InvoiceForms.xml"/>
                                     </screenlet>
                                     <screenlet title="${uiLabelMap.AccountingAppliedPayments} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"
-                                        navigation-form-name="ListInvoiceApplications">
-                                        <include-form name="ListInvoiceApplications" location="component://accounting/widget/InvoiceForms.xml"/>
+                                        navigation-form-name="InvoiceOverviewPayments">
+                                        <include-grid name="InvoiceOverviewPayments" location="component://accounting/widget/InvoiceForms.xml"/>
                                     </screenlet>
                                 </container>
                                 <container style="righthalf">
@@ -370,16 +346,15 @@ under the License.
         </section>
     </screen>
 
-    <screen name="EditInvoiceApplications">
+    <screen name="InvoicePayments">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleListEditInvoiceApplications"/>
-                <set field="tabButtonItem" value="editInvoiceApplications"/>
-                <set field="helpAnchor" value="_help_for_edit_invoice_applications"/>
-
+                <set field="titleProperty" value="PageTitleListInvoicePayments"/>
+                <set field="tabButtonItem" value="invoicePayments"/>
+                <set field="helpAnchor" value="_help_for_invoice_payments"/>
                 <set field="invoiceId" from-field="parameters.invoiceId"/>
                 <entity-one entity-name="Invoice" value-field="invoice"/>
-                <script location="component://accounting/groovyScripts/invoice/CreateApplicationList.groovy"/>
+                <script location="component://accounting/groovyScripts/invoice/InvoicePayments.groovy"/>
                 <script location="component://accounting/groovyScripts/invoice/ListNotAppliedPayments.groovy"/>
                 <set field="invoiceAmount" value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/>
                 <set field="notAppliedAmount" value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/>
@@ -390,11 +365,17 @@ under the License.
                     <decorator-section name="body">
                         <section>
                             <condition>
-                                <if-compare field="notAppliedAmount" operator="greater" value="0"/>
+                                <and>
+                                    <or>
+                                        <if-has-permission permission="ACCOUNTING" action="_CREATE"/>
+                                        <if-has-permission permission="ACCOUNTING" action="_UPDATE"/>
+                                    </or>
+                                    <if-compare field="notAppliedAmount" operator="greater" value="0"/>
+                                </and>
                             </condition>
                             <widgets>
                                 <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}">
-                                   <include-form name="EditInvoiceApplications" location="component://accounting/widget/InvoiceForms.xml"/>
+                                   <include-grid name="UpdateInvoicePayments" location="component://accounting/widget/InvoiceForms.xml"/>
                                 </screenlet>
                                 <section>
                                     <condition>
@@ -438,7 +419,7 @@ under the License.
                             </widgets>
                             <fail-widgets>
                                 <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${invoice.currencyUomId})}  ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}">
-                                    <include-form name="EditInvoiceApplications" location="component://accounting/widget/InvoiceForms.xml"/>
+                                    <include-grid name="InvoicePayments" location="component://accounting/widget/InvoiceForms.xml"/>
                                 </screenlet>
                                 <section>
                                     <condition>