This is an automated email from the ASF dual-hosted git repository.
jleroux 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 ec0adc02f1 Fixed: Wrong partyId Accounts Payable (OFBIZ-13063)
ec0adc02f1 is described below
commit ec0adc02f102d75be15e1ee04062b75621219f0d
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Apr 23 17:28:01 2024 +0200
Fixed: Wrong partyId Accounts Payable (OFBIZ-13063)
In previous commit I removed AccountingOutstanding added by Pierre (just en
and
nl translations) then used anywhere.
Pierre contacted me and rightly mentioned that the English translation of
property key="<property key="FormFieldTitle_amountToApply">" was wrong.
It should logically have been "Amount to apply" (an old wrong change of
revision 775580 put in the mistake)
So I changed that and re-added AccountingOutstanding though using
FormFieldTitle_outstanding to replace in right places in both
accounting and ar InvoiceForms.xml.
Pfew...
---
applications/accounting/config/AccountingUiLabels.xml | 7 ++++++-
applications/accounting/widget/InvoiceForms.xml | 4 ++--
applications/accounting/widget/ar/forms/InvoiceForms.xml | 6 +++---
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/applications/accounting/config/AccountingUiLabels.xml
b/applications/accounting/config/AccountingUiLabels.xml
index 3a514223e8..72dd64952e 100644
--- a/applications/accounting/config/AccountingUiLabels.xml
+++ b/applications/accounting/config/AccountingUiLabels.xml
@@ -17595,7 +17595,7 @@
<property key="FormFieldTitle_amountToApply">
<value xml:lang="ar">المبلغ المعلق</value>
<value xml:lang="de">zuzuweisender Betrag</value>
- <value xml:lang="en">Outstanding amount</value>
+ <value xml:lang="en">Amount to apply</value>
<value xml:lang="es">Cantidad por aplicar</value>
<value xml:lang="es-CL">Cantidad a Aplicar</value>
<value xml:lang="fr">Montant à enregistrer</value>
@@ -20178,6 +20178,11 @@
<value xml:lang="zh">待结金额</value>
<value xml:lang="zh-TW">待結金額</value>
</property>
+ <property key="FormFieldTitle_outstanding">
+ <value xml:lang="en">Outstanding amount</value>
+ <value xml:lang="fr">Encours</value>
+ <value xml:lang="nl">Openstaand</value>
+ </property>
<property key="FormFieldTitle_overrideGlAccountId">
<value xml:lang="ar">دليل حساب GL التجاوز</value>
<value xml:lang="de">Übersteuere Hauptbuchkonto ID</value>
diff --git a/applications/accounting/widget/InvoiceForms.xml
b/applications/accounting/widget/InvoiceForms.xml
index 4d20a213ba..c398276662 100644
--- a/applications/accounting/widget/InvoiceForms.xml
+++ b/applications/accounting/widget/InvoiceForms.xml
@@ -772,7 +772,7 @@ under the License.
<field name="invoiceDate"><display type="date"/></field>
<field name="dueDate"><display type="date"/></field>
<field name="total" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
- <field name="outstanding"
title="${uiLabelMap.FormFieldTitle_amountToApply}"
widget-area-style="align-text"><display type="currency"
currency="${currencyUomId}"/></field>
+ <field name="outstanding" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
</grid>
<grid name="ListApReport" separate-columns="true" title="Invoice List"
list-name="invoices" target=""
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar" paginate="true" paginate-target="main">
@@ -805,6 +805,6 @@ under the License.
<field name="invoiceDate"><display type="date"/></field>
<field name="dueDate"><display type="date"/></field>
<field name="total" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
- <field name="outstanding"
title="${uiLabelMap.FormFieldTitle_amountToApply}"
widget-area-style="align-text"><display type="currency"
currency="${currencyUomId}"/></field>
+ <field name="amountToApply" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
</grid>
</forms>
diff --git a/applications/accounting/widget/ar/forms/InvoiceForms.xml
b/applications/accounting/widget/ar/forms/InvoiceForms.xml
index b2ed9b5168..dcb9fed1e5 100644
--- a/applications/accounting/widget/ar/forms/InvoiceForms.xml
+++ b/applications/accounting/widget/ar/forms/InvoiceForms.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<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";>
<!-- show list of upto 10 Invoices past due for longest duration -->
@@ -63,7 +63,7 @@ under the License.
<field name="invoiceDate"><display/></field>
<field name="dueDate"><display/></field>
<field name="total" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
- <field name="amountToApply" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
+ <field name="outstanding" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
</form>
<form name="FindArInvoices" type="single" target="FindArInvoices"
extends="FindInvoices"
extends-resource="component://accounting/widget/InvoiceForms.xml">
@@ -81,5 +81,5 @@ under the License.
</drop-down>
</field>
</form>
-
+
</forms>
