Implemented: Convert Invoice relation screen to dynamic Compound (OFBIZ-12994)

applications/accounting/config/AccountingUiLabels.xml

@@ -7911,6 +7911,10 @@
         <value xml:lang="zh">支付的币种[${paymentCurrencyId}]与发票明细的币种[${itemCurrency}]不同</value>
         <value xml:lang="zh-TW">支付的幣種[${paymentCurrencyId}]與發票細項的幣種[${itemCurrency}]不同</value>
     </property>
+    <property key="AccountingInvoiceItemsEdit">
+        <value xml:lang="en">Edit invoice Items</value>
+        <value xml:lang="fr">Modifier les lignes de facturation</value>
+    </property>
     <property key="AccountingInvoiceItemSeqId">
         <value xml:lang="ar">رقم البند</value>
         <value xml:lang="de">Pos.Nr.</value>
@@ -8420,6 +8424,14 @@
         <value xml:lang="zh">状态变为'注消'</value>
         <value xml:lang="zh-TW">狀態變為'註銷'</value>
     </property>
+    <property key="AccountingInvoiceTermsAdd">
+        <value xml:lang="en">Add due date rule</value>
+        <value xml:lang="fr">Ajouter une échéance</value>
+    </property>
+    <property key="AccountingInvoiceTermsEdit">
+        <value xml:lang="en">Edit due date rules</value>
+        <value xml:lang="fr">Modifier les échéances</value>
+    </property>
     <property key="AccountingInvoiceTimeEntries">
         <value xml:lang="ar">قيود وقتية</value>
         <value xml:lang="cs">Časová evidence</value>

applications/accounting/webapp/accounting/WEB-INF/accounting-controller.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://ofbiz.apache.org/Site-Conf" xsi:schemaLocation="http://ofbiz.apache.org/Site-Conf http://ofbiz.apache.org/dtds/site-conf.xsd">
+
+    <include location="component://accounting/widget/accounting/AccountingInvoiceCpd.xml"/>
+    <include location="component://accounting/widget/accounting/AccountingInvoiceApplicationCpd.xml"/>
+    <include location="component://accounting/widget/accounting/AccountingInvoiceAttributeCpd.xml"/>
+    <include location="component://accounting/widget/accounting/AccountingInvoiceContactMechCpd.xml"/>
+    <include location="component://accounting/widget/accounting/AccountingInvoiceContentCpd.xml"/>
+    <include location="component://accounting/widget/accounting/AccountingInvoiceItemCpd.xml"/>
+    <include location="component://accounting/widget/accounting/AccountingInvoiceNoteCpd.xml"/>
+    <include location="component://accounting/widget/accounting/AccountingInvoiceRoleCpd.xml"/>
+    <include location="component://accounting/widget/accounting/AccountingInvoiceStatusCpd.xml"/>
+    <include location="component://accounting/widget/accounting/AccountingInvoiceTermCpd.xml"/>
+    <include location="component://accounting/widget/accounting/AccountingInvoiceTimeEntryCpd.xml"/>
+
+    <description>List Accounting compound files</description>
+
+</site-conf>

applications/accounting/webapp/accounting/WEB-INF/controller.xml

@@ -22,6 +22,8 @@ under the License.
         xmlns="http://ofbiz.apache.org/Site-Conf" xsi:schemaLocation="http://ofbiz.apache.org/Site-Conf http://ofbiz.apache.org/dtds/site-conf.xsd">
     <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
     <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
+    <include location="component://accounting/webapp/accounting/WEB-INF/accounting-controller.xml"/>
+
     <description>Accounting Manager Module Site Configuration File</description>
 
     <!-- Events to run on every request before security (chains exempt) -->
@@ -2640,7 +2642,7 @@ under the License.
     <view-map name="BillingAccountOrders" type="screen" page="component://accounting/widget/BillingAccountScreens.xml#BillingAccountOrders"/>
 
     <!-- Invoice -->
-    <view-map name="invoiceOverview" type="screen" page="component://accounting/widget/InvoiceScreens.xml#invoiceOverview"/>
+    <view-map name="invoiceOverview" type="screen" page="component://accounting/widget/InvoiceScreens.xml#InvoiceOverview"/>
     <view-map name="findInvoices" type="screen" page="component://accounting/widget/InvoiceScreens.xml#FindInvoices"/>
     <view-map name="newInvoice" type="screen" page="component://accounting/widget/InvoiceScreens.xml#NewInvoice"/>
     <view-map name="editInvoice" type="screen" page="component://accounting/widget/InvoiceScreens.xml#EditInvoice"/>

applications/accounting/widget/AccountingMenus.xml

@@ -52,7 +52,7 @@ under the License.
         <menu-item name="GlobalGLSettings" title="${uiLabelMap.AccountingGlobalGLSettings}"><link target="globalGLSettings"/></menu-item>
         <menu-item name="companies" title="${uiLabelMap.AccountingOrgGlSettings}"><link target="ListCompanies"/></menu-item>
     </menu>
-        <menu name="MainActionMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+    <menu name="MainActionMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected">
         <menu-item name="NewGLTransaction" title="${uiLabelMap.CommonCreate} ${uiLabelMap.GlTransaction}">
             <condition>
                 <or>
@@ -69,7 +69,11 @@ under the License.
                     <if-has-permission permission="ACCOUNTING" action="_CREATE"/>
                 </or>
             </condition>
-            <link target="newInvoice"/>
+            <link target="Accounting/Invoice/New" link-type="layered-modal">
+                <set-callback area-target="invoiceOverview" area-id="window">
+                    <parameter param-name="invoiceId" from-event-result="invoiceId"/>
+                </set-callback>
+            </link>
         </menu-item>
         <menu-item name="NewPayment" title="${uiLabelMap.CommonCreate} ${uiLabelMap.CommonPayment}">
             <condition>
@@ -289,8 +293,11 @@ under the License.
                     </or>
                 </and>
             </condition>
-            <link target="editInvoice">
+            <link target="Accounting/Invoice/Edit" link-type="layered-modal">
                 <parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
+                <set-callback area-target="invoiceOverview" area-id="window">
+                    <parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
+                </set-callback>
             </link>
         </menu-item>
         <menu-item name="copyInvoice" title="${uiLabelMap.CommonCopy}">

applications/accounting/widget/CommonScreens.xml

@@ -342,4 +342,24 @@ under the License.
             </widgets>
         </section>
     </screen>
+
+    <screen name="CommonEmbeddedDecorator">
+        <section>
+            <actions>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingEntityLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="EmbeddedDecorator" location="component://common/widget/CommonScreens.xml"/>
+            </widgets>
+        </section>
+    </screen>
+
 </screens>