You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2024/04/15 16:27:58 UTC
(ofbiz-framework) branch trunk updated: Improved: improve Dutch labels (OFBIZ-13032) (#765)
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 e740f56701 Improved: improve Dutch labels (OFBIZ-13032) (#765)
e740f56701 is described below
commit e740f56701a9e0a970f89415c962ac37ae2d5570
Author: Pierre Smits <pi...@somonar.com>
AuthorDate: Mon Apr 15 18:27:53 2024 +0200
Improved: improve Dutch labels (OFBIZ-13032) (#765)
* Improved: Improve dutch label (OFBIZ-13032)
modified AccountingUiLabels.xml, CommonUiLabels.xml
- AccountingInvoicesDueSoon
- WebTools
* Improved: improve Dutch labels (OFBIZ-13032)
AccountingOutstanding added
modified: AccountingUiLabels.xml, InvoiceForrms.xml
---
applications/accounting/config/AccountingUiLabels.xml | 4 ++++
applications/accounting/widget/InvoiceForms.xml | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/applications/accounting/config/AccountingUiLabels.xml b/applications/accounting/config/AccountingUiLabels.xml
index d37cbc139e..d8896976ea 100644
--- a/applications/accounting/config/AccountingUiLabels.xml
+++ b/applications/accounting/config/AccountingUiLabels.xml
@@ -10436,6 +10436,10 @@
<value xml:lang="zh">经营性现金</value>
<value xml:lang="zh-TW">經營性現金</value>
</property>
+ <property key="AccountingOutstanding">
+ <value xml:lang="en">Outstanding</value>
+ <value xml:lang="nl">Openstaand</value>
+ </property>
<property key="AccountingOrderItemWithIdNotFound">
<value xml:lang="ar">لم يتم العثور على بند أمر البيع/الشراء ذو الدليل ${orderItemSeqId}</value>
<value xml:lang="de">Auftragsposition mit Nummer ${orderItemSeqId} nicht gefunden.</value>
diff --git a/applications/accounting/widget/InvoiceForms.xml b/applications/accounting/widget/InvoiceForms.xml
index ebeb977ba8..b41d0770b0 100644
--- a/applications/accounting/widget/InvoiceForms.xml
+++ b/applications/accounting/widget/InvoiceForms.xml
@@ -750,7 +750,7 @@ under the License.
<field-map field-name="compareDate" from-field="invoiceDate"/>
<field-map field-name="lastNameFirst" value="Y"/>
</service>
- <set field="amountToApply" value="${groovy:
+ <set field="outstanding" value="${groovy:
import java.text.NumberFormat;
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/>
<set field="total" value="${groovy:
@@ -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="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
+ <field name="outstanding" title="${uiLabelMap.AccountingOutstanding}" 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">
@@ -783,7 +783,7 @@ under the License.
<field-map field-name="compareDate" from-field="invoiceDate"/>
<field-map field-name="lastNameFirst" value="Y"/>
</service>
- <set field="amountToApply" value="${groovy:
+ <set field="outstanding" value="${groovy:
import java.text.NumberFormat;
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/>
<set field="total" value="${groovy:
@@ -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="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
+ <field name="outstanding" title="${uiLabelMap.AccountingOutstanding}" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
</grid>
</forms>