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 4f1bde0540 Fixed: invoiceOverview generates an error (OFBIZ-13017)
4f1bde0540 is described below
commit 4f1bde0540495b80cef25c9cf88c05a294af3800
Author: Jacques Le Roux
AuthorDate: Sat Apr 20 08:44:34 2024 +0200
Fixed: invoiceOverview generates an error (OFBIZ-13017)
Fixes the problem by replacing replacing all invoiceOverview occurrences in
OFBiz by ViewInvoice. There are no longer other occurrences of
"invoiceOverview"
This is a maybe temporary workaround. Possibly more is needed as we want to
use
AccountingInvoiceCpd.xml and related changes that were introduced with
OFBIZ-12994. I suppose it's enough for the moment since it does not
introduce
other changes.
As she proposed me, I have asked Leïla to have a look because she knows that
more than me having worked on OFBIZ-12994. Maybe a complete refactor is
needed.
---
.../template/ap/invoices/CommissionReport.ftl | 2 +-
.../template/ap/invoices/CommissionRun.ftl | 2 +-
.../template/ap/invoices/PurchaseInvoices.ftl | 2 +-
.../template/ar/invoice/ListInvoices.ftl | 2 +-
.../template/invoice/CommissionRunSearchResult.ftl | 2 +-
.../webapp/accounting/WEB-INF/controller.xml | 46 +++---
applications/accounting/widget/AccountingMenus.xml | 8 ++--
.../accounting/widget/BillingAccountForms.xml | 2 +-
applications/accounting/widget/GlForms.xml | 4 +-
applications/accounting/widget/InvoiceForms.xml| 8 ++--
applications/accounting/widget/InvoiceScreens.xml | 4 +-
applications/accounting/widget/PaymentForms.xml| 10 ++---
.../widget/accounting/AccountingInvoiceCpd.xml | 4 +-
.../accounting/widget/ap/forms/InvoiceForms.xml| 2 +-
.../accounting/widget/ar/forms/InvoiceForms.xml| 2 +-
.../humanres/widget/forms/EmployeeForms.xml| 2 +-
.../order/template/order/OrderPaymentInfo.ftl | 4 +-
applications/party/widget/partymgr/PartyForms.xml | 4 +-
.../product/template/shipment/PackOrder.ftl| 2 +-
.../product/template/shipment/VerifyPick.ftl | 2 +-
.../product/template/shipment/WeightPackage.ftl| 2 +-
applications/workeffort/widget/TimesheetForms.xml | 2 +-
22 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/applications/accounting/template/ap/invoices/CommissionReport.ftl
b/applications/accounting/template/ap/invoices/CommissionReport.ftl
index 4967e16dff..b4b08f2547 100644
--- a/applications/accounting/template/ap/invoices/CommissionReport.ftl
+++ b/applications/accounting/template/ap/invoices/CommissionReport.ftl
@@ -41,7 +41,7 @@ under the License.
${commissionReport.numberOfOrders!} /
<#if commissionReport.salesInvoiceIds?has_content>
<#list commissionReport.salesInvoiceIds as salesInvoiceId>
- [invoiceOverview?invoiceId=${salesInvoiceId!}">${salesInvoiceId!}]
+ [viewInvoice?invoiceId=${salesInvoiceId!}">${salesInvoiceId!}]
diff --git a/applications/accounting/template/ap/invoices/CommissionRun.ftl
b/applications/accounting/template/ap/invoices/CommissionRun.ftl
index d516be785a..3d5a18c283 100644
--- a/applications/accounting/template/ap/invoices/CommissionRun.ftl
+++ b/applications/accounting/template/ap/invoices/CommissionRun.ftl
@@ -108,7 +108,7 @@ function enableSubmitButton() {
<#assign statusItem = delegator.findOne("StatusItem", {"statusId" :
invoice.statusId}, false)!/>
class="alternate-row">
- ${invoice.get("invoiceId")}
+ ${invoice.get("invoiceId")}
viewprofile?partyId=${invoice.partyIdFrom}">${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
invoice.partyIdFrom, false)!}
viewprofile?partyId=${invoice.invoiceRolePartyId}">${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
invoice.invoiceRolePartyId, false)!}
${statusItem.get("description")!}
diff --git a/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl
b/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl
index 4397a134a7..3bfa1f3003 100644
--- a/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl
+++ b/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl
@@ -191,7 +191,7 @@ function runAction() {
<#assign invoicePaymentInfo =
invoicePaymentInfoList.get("invoicePaymentInfoList").get(0)!>
<#assign statusItem = invoice.getRelatedOne("StatusItem", true)>
class="alternate-row">
-${invoice.get("invoiceId")}
+${invoice.get("invoiceId")}
<#if
