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 04007a9e10 Fixed: Error when showing invoice of project time/material
(OFBIZ-12734)
04007a9e10 is described below
commit 04007a9e10204b488e9d1185cae58fcdc0ebd3f1
Author: Jacques Le Roux <[email protected]>
AuthorDate: Sat Jan 7 14:28:09 2023 +0100
Fixed: Error when showing invoice of project time/material (OFBIZ-12734)
This was broken by OFBIZ-11345 where a change in InvoiceScreens.xml from
form
to grid for ListTimeEntries was forgotten
Thanks: yannong huang for detailed report
---
applications/accounting/widget/InvoiceScreens.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/applications/accounting/widget/InvoiceScreens.xml
b/applications/accounting/widget/InvoiceScreens.xml
index 0ca84127f4..183200ebb6 100644
--- a/applications/accounting/widget/InvoiceScreens.xml
+++ b/applications/accounting/widget/InvoiceScreens.xml
@@ -256,7 +256,7 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.AccountingInvoiceTimeEntries}"
navigation-form-name="ListTimeEntries">
- <include-form
name="ListTimeEntries"
location="component://accounting/widget/InvoiceForms.xml"/>
+ <include-grid
name="ListTimeEntries"
location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -370,7 +370,7 @@ under the License.
<if-compare field="notAppliedAmount"
operator="greater" value="0"/>
</condition>
<widgets>
- <screenlet
title="${uiLabelMap.AccountingPaymentsApplied}
${appliedAmount?currency(${invoice.currencyUomId})}
+ <screenlet
title="${uiLabelMap.AccountingPaymentsApplied}
${appliedAmount?currency(${invoice.currencyUomId})}
${uiLabelMap.AccountingOpenPayments}
${notAppliedAmount?currency(${invoice.currencyUomId})}">
<include-grid
name="EditInvoiceApplications"
location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
@@ -390,7 +390,7 @@ under the License.
</or>
</condition>
<widgets>
- <screenlet
title="${uiLabelMap.AccountingListPaymentsNotYetApplied}
[${invoice.partyIdFrom}]
+ <screenlet
title="${uiLabelMap.AccountingListPaymentsNotYetApplied}
[${invoice.partyIdFrom}]
${uiLabelMap.AccountingPaymentSentForm} [${invoice.partyId}]">
<section>
<condition>
@@ -416,7 +416,7 @@ under the License.
</screenlet>
</widgets>
<fail-widgets>
- <screenlet
title="${uiLabelMap.AccountingPaymentsApplied}
${appliedAmount?currency(${invoice.currencyUomId})}
+ <screenlet
title="${uiLabelMap.AccountingPaymentsApplied}
${appliedAmount?currency(${invoice.currencyUomId})}
${uiLabelMap.AccountingOpenPayments}
${notAppliedAmount?currency(${invoice.currencyUomId})}">
<include-grid
name="EditInvoiceApplications"
location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
@@ -434,8 +434,8 @@ under the License.
</section>
</widgets>
<fail-widgets>
- <screenlet
-
title="${uiLabelMap.AccountingAppliedPayments}
${appliedAmount?currency(${invoice.currencyUomId})}
+ <screenlet
+
title="${uiLabelMap.AccountingAppliedPayments}
${appliedAmount?currency(${invoice.currencyUomId})}
${uiLabelMap.AccountingOpenPayments}
${notAppliedAmount?currency(${invoice.currencyUomId})}"
navigation-form-name="ListInvoiceApplications">
<include-grid
name="ListInvoiceApplications"
location="component://accounting/widget/InvoiceForms.xml"/>
