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 <jacques.le.r...@les7arts.com>
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>
- [<a href="<@ofbizUrl
controlPath="/ap/control">invoiceOverview?invoiceId=${salesInvoiceId!}</@ofbizUrl>">${salesInvoiceId!}</a>]
+ [<a href="<@ofbizUrl
controlPath="/ap/control">viewInvoice?invoiceId=${salesInvoiceId!}</@ofbizUrl>">${salesInvoiceId!}</a>]
</#list>
</#if>
</td>
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)!/>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td><label><input type="checkbox" id="invoiceId_${invoice_index}"
name="invoiceIds" value="${invoice.invoiceId}"
onclick="javascript:enableSubmitButton();"/></label></td>
- <td><a class="buttontext"
href="<@ofbizUrl>invoiceOverview?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td>
+ <td><a class="buttontext"
href="<@ofbizUrl>viewInvoice?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td>
<td><a href="<@ofbizUrl
controlPath="/partymgr/control">viewprofile?partyId=${invoice.partyIdFrom}</@ofbizUrl>">${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
invoice.partyIdFrom, false)!}</a></td>
<td><a href="<@ofbizUrl
controlPath="/partymgr/control">viewprofile?partyId=${invoice.invoiceRolePartyId}</@ofbizUrl>">${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
invoice.invoiceRolePartyId, false)!}</a></td>
<td>${statusItem.get("description")!}</td>
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)>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td><a class="buttontext"
href="<@ofbizUrl>invoiceOverview?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td>
+ <td><a class="buttontext"
href="<@ofbizUrl>viewInvoice?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td>
<td><#if
invoice.get("invoiceDate")?has_content>${invoice.get("invoiceDate")?date}</td></#if>
<td><#if
invoice.get("dueDate")?has_content>${invoice.get("dueDate")?date}</td></#if>
<td>${statusItem.description?default(invoice.statusId)}</td>
diff --git a/applications/accounting/template/ar/invoice/ListInvoices.ftl
b/applications/accounting/template/ar/invoice/ListInvoices.ftl
index 9f3d7ae0fc..81d8f1c94c 100644
--- a/applications/accounting/template/ar/invoice/ListInvoices.ftl
+++ b/applications/accounting/template/ar/invoice/ListInvoices.ftl
@@ -165,7 +165,7 @@ under the License.
<#assign invoicePaymentInfoList =
dispatcher.runSync("getInvoicePaymentInfoList",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("invoiceId",
invoice.invoiceId, "userLogin", userLogin))/>
<#assign invoicePaymentInfo =
invoicePaymentInfoList.get("invoicePaymentInfoList").get(0)!>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td><a class="buttontext"
href="<@ofbizUrl>invoiceOverview?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td>
+ <td><a class="buttontext"
href="<@ofbizUrl>viewInvoice?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td>
<td>
<#assign invoiceType = delegator.findOne("InvoiceType",
{"invoiceTypeId" : invoice.invoiceTypeId}, true) />
${invoiceType.description?default(invoice.invoiceTypeId)}
diff --git
a/applications/accounting/template/invoice/CommissionRunSearchResult.ftl
b/applications/accounting/template/invoice/CommissionRunSearchResult.ftl
index 12cc0ae6c0..a625c9af5e 100644
--- a/applications/accounting/template/invoice/CommissionRunSearchResult.ftl
+++ b/applications/accounting/template/invoice/CommissionRunSearchResult.ftl
@@ -44,7 +44,7 @@ under the License.
<#assign invoicePaymentInfo =
invoicePaymentInfoList.get("invoicePaymentInfoList").get(0)!>
<#assign statusItem = delegator.findOne("StatusItem", {"statusId" :
invoice.statusId}, false)!/>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td><a class="buttontext"
href="<@ofbizUrl>invoiceOverview?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td>
+ <td><a class="buttontext"
href="<@ofbizUrl>viewInvoice?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td>
<td><a href="<@ofbizUrl
controlPath="/partymgr/control">viewprofile?partyId=${invoice.partyIdFrom}</@ofbizUrl>">${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
invoice.partyIdFrom, false)!}</a></td>
<td><a href="<@ofbizUrl
controlPath="/partymgr/control">viewprofile?partyId=${invoice.invoiceRolePartyId}</@ofbizUrl>">${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
invoice.invoiceRolePartyId, false)!}</a></td>
<td>${statusItem.get("description")!}</td>
diff --git a/applications/accounting/webapp/accounting/WEB-INF/controller.xml
b/applications/accounting/webapp/accounting/WEB-INF/controller.xml
index 74ecafbc4f..67ab3dd672 100644
--- a/applications/accounting/webapp/accounting/WEB-INF/controller.xml
+++ b/applications/accounting/webapp/accounting/WEB-INF/controller.xml
@@ -43,7 +43,7 @@ under the License.
<security https="true" auth="false"/>
<response name="success" type="request" value="main"/>
</request-map>
-
+
<request-map uri="main">
<security https="true" auth="true"/>
<response name="success" type="view" value="main"/>
@@ -147,9 +147,9 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="findInvoices"/>
</request-map>
- <request-map uri="invoiceOverview">
+ <request-map uri="viewInvoice">
<security https="true" auth="true"/>
- <response name="success" type="view" value="invoiceOverview"/>
+ <response name="success" type="view" value="ViewInvoice"/>
</request-map>
<request-map uri="newInvoice">
<security https="true" auth="true"/>
@@ -168,8 +168,8 @@ under the License.
<request-map uri="copyInvoice">
<security https="true" auth="true"/>
<event type="service" invoke="copyInvoice"/>
- <response name="success" type="view" value="invoiceOverview"/>
- <response name="error" type="view" value="invoiceOverview"/>
+ <response name="success" type="view" value="ViewInvoice"/>
+ <response name="error" type="view" value="ViewInvoice"/>
</request-map>
<request-map uri="updateInvoice">
<security https="true" auth="true"/>
@@ -251,7 +251,7 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="invoiceNotes"/>
</request-map>
-
+
<!-- re Invoice Roles -->
<request-map uri="invoiceRoles">
<security https="true" auth="true"/>
@@ -269,14 +269,14 @@ under the License.
<response name="success" type="view" value="invoiceRoles"/>
<response name="error" type="view" value="invoiceRoles"/>
</request-map>
-
+
<request-map uri="setInvoiceStatus">
<security https="true" auth="true"/>
<event type="service" invoke="setInvoiceStatus"/>
- <response name="success" type="view" value="invoiceOverview"/>
- <response name="error" type="view" value="invoiceOverview"/>
+ <response name="success" type="view" value="ViewInvoice"/>
+ <response name="error" type="view" value="ViewInvoice"/>
</request-map>
-
+
<!-- re Invoice Terms -->
<request-map uri="invoiceTerms">
<security https="true" auth="true"/>
@@ -305,7 +305,7 @@ under the License.
<response name="success" type="view" value="invoiceTerms"/>
<response name="error" type="view" value="invoiceTerms"/>
</request-map>
-
+
<request-map uri="sendPerEmail">
<security https="true" auth="true"/>
<response name="success" type="view" value="sendPerEmail"/>
@@ -313,8 +313,8 @@ under the License.
<request-map uri="executeSendPerEmail">
<security https="true" auth="true"/>
<event type="service" invoke="sendInvoicePerEmail"/>
- <response name="success" type="view" value="invoiceOverview"/>
- <response name="error" type="view" value="invoiceOverview"/>
+ <response name="success" type="view" value="ViewInvoice"/>
+ <response name="error" type="view" value="ViewInvoice"/>
</request-map>
<request-map uri="copyInvoiceToTemplate">
<security https="true" auth="true"/>
@@ -403,7 +403,7 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="PrintChecks"/>
</request-map>
-
+
<request-map uri="InvoiceAcctgTransEntriesPdf">
<security https="true" auth="true"/>
<response name="success" type="view"
value="InvoiceAcctgTransEntriesPdf"/>
@@ -789,7 +789,7 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="ListGlAccountOrgCsv"/>
</request-map>
-
+
<!-- Import export -->
<request-map uri="ImportExport">
<security https="true" auth="true"/>
@@ -1090,7 +1090,7 @@ under the License.
<response name="success" type="view"
value="EditFixedAssetMaintOrders"/>
<response name="error" type="view" value="EditFixedAssetMaintOrders"/>
</request-map>
-
+
<!-- =============== Budget mapping =================-->
<request-map uri="ListBudgets"><security https="true"
auth="true"/><response name="success" type="view"
value="ListBudgets"/></request-map>
<request-map uri="BudgetSearchResults"><security https="true"
auth="false"/><response name="success" type="view"
value="BudgetSearchResults"/></request-map>
@@ -1159,7 +1159,7 @@ under the License.
<response name="success" type="view" value="BudgetReviews"/>
<response name="error" type="view" value="BudgetReviews"/>
</request-map>
-
+
<!-- =============== Agreement mapping =================-->
<request-map uri="FindAgreement"><security https="true"
auth="true"/><response name="success" type="view"
value="FindAgreement"/></request-map>
<request-map uri="cancelAgreement">
@@ -1531,7 +1531,7 @@ under the License.
<response name="success" type="view" value="FindTaxAuthorityReport"/>
<response name="error" type="view" value="FindTaxAuthorityReport"/>
</request-map>
-
+
<!-- ================ Administratvie Requests ================ -->
<request-map uri="ListCompanies">
@@ -2536,7 +2536,7 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="CommissionRun"/>
</request-map>
-
+
<request-map uri="processCommissionRun">
<security https="true" auth="true"/>
<event type="service" invoke="createCommissionInvoices"/>
@@ -2547,8 +2547,8 @@ under the License.
<request-map uri="addtax">
<security auth="true" https="true"/>
<event type="service" invoke="addtax"/>
- <response name="success" type="view" value="invoiceOverview"/>
- <response name="error" type="view" value="invoiceOverview"/>
+ <response name="success" type="view" value="ViewInvoice"/>
+ <response name="error" type="view" value="ViewInvoice"/>
</request-map>
<request-map uri="FindGlAccountCategory">
@@ -2642,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="ViewInvoice" type="screen"
page="component://accounting/widget/InvoiceScreens.xml#ViewInvoice"/>
<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"/>
@@ -2792,7 +2792,7 @@ under the License.
<view-map name="ListTaxAuthorityParties" type="screen"
page="component://accounting/widget/TaxAuthorityScreens.xml#ListTaxAuthorityParties"/>
<view-map name="EditTaxAuthorityPartyInfo" type="screen"
page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityPartyInfo"/>
<view-map name="FindTaxAuthorityReport" type="screen"
page="component://accounting/widget/TaxAuthorityScreens.xml#FindTaxAuthorityReport"/>
-
+
<!-- administrative pages -->
<view-map name="ListCompanies" type="screen"
page="component://accounting/widget/GlSetupScreens.xml#ListCompanies"/>
<view-map name="AddCompany" type="screen"
page="component://accounting/widget/GlSetupScreens.xml#AddCompany"/>
diff --git a/applications/accounting/widget/AccountingMenus.xml
b/applications/accounting/widget/AccountingMenus.xml
index 55d6afe2af..21d70cf38a 100644
--- a/applications/accounting/widget/AccountingMenus.xml
+++ b/applications/accounting/widget/AccountingMenus.xml
@@ -69,7 +69,7 @@ under the License.
</or>
</condition>
<link target="Accounting/Invoice/New" link-type="layered-modal">
- <set-callback area-target="invoiceOverview" area-id="window">
+ <set-callback area-target="viewInvoice" area-id="window">
<parameter param-name="invoiceId"
from-event-result="invoiceId"/>
</set-callback>
</link>
@@ -152,11 +152,11 @@ under the License.
<menu-item name="find" title="${uiLabelMap.CommonFind}">
<link target="findInvoices"/>
</menu-item>
- <menu-item name="invoiceOverview"
title="${uiLabelMap.AccountingInvoiceOverview}">
+ <menu-item name="viewInvoice"
title="${uiLabelMap.AccountingInvoiceOverview}">
<condition>
<not><if-empty field="invoice.invoiceId"/></not>
</condition>
- <link target="invoiceOverview">
+ <link target="viewInvoice">
<parameter param-name="invoiceId"
from-field="invoice.invoiceId"/>
</link>
</menu-item>
@@ -294,7 +294,7 @@ under the License.
</condition>
<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">
+ <set-callback area-target="viewInvoice" area-id="window">
<parameter param-name="invoiceId"
from-field="invoice.invoiceId"/>
</set-callback>
</link>
diff --git a/applications/accounting/widget/BillingAccountForms.xml
b/applications/accounting/widget/BillingAccountForms.xml
index 18cae6fb37..f55a6ce4c1 100644
--- a/applications/accounting/widget/BillingAccountForms.xml
+++ b/applications/accounting/widget/BillingAccountForms.xml
@@ -90,7 +90,7 @@ under the License.
</row-actions>
<field name="billingAccountId"><hidden/></field>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink description="${invoiceId}" target="invoiceOverview">
+ <hyperlink description="${invoiceId}" target="viewInvoice">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/GlForms.xml
b/applications/accounting/widget/GlForms.xml
index a3e5180f94..3288e7cb5e 100644
--- a/applications/accounting/widget/GlForms.xml
+++ b/applications/accounting/widget/GlForms.xml
@@ -531,7 +531,7 @@ under the License.
<field name="workEffortId"><lookup target-form-name="LookupWorkEffort"
size="20" maxlength="20"/></field>
<field name="invoiceId">
<lookup target-form-name="LookupInvoice" size="20" maxlength="20">
- <sub-hyperlink
target="invoiceOverview?invoiceId=${acctgTrans.invoiceId}"
description="${acctgTrans.invoiceId}"/>
+ <sub-hyperlink
target="viewInvoice?invoiceId=${acctgTrans.invoiceId}"
description="${acctgTrans.invoiceId}"/>
</lookup>
</field>
<field name="paymentId">
@@ -948,7 +948,7 @@ under the License.
<field name="postedDate" position="2"/>
<field name="inventoryItemId" position="1"/>
<field name="physicalInventoryId" position="2"/>
- <field name="invoiceId" position="1"><hyperlink
description="${acctgTrans.invoiceId}"
target="invoiceOverview?invoiceId=${acctgTrans.invoiceId}"/></field>
+ <field name="invoiceId" position="1"><hyperlink
description="${acctgTrans.invoiceId}"
target="viewInvoice?invoiceId=${acctgTrans.invoiceId}"/></field>
<field name="paymentId" position="2"><hyperlink
description="${acctgTrans.paymentId}"
target="paymentOverview?paymentId=${acctgTrans.paymentId}"/></field>
<field name="receiptId" position="1"/>
<field name="workEffortId" position="2"/>
diff --git a/applications/accounting/widget/InvoiceForms.xml
b/applications/accounting/widget/InvoiceForms.xml
index b41d0770b0..9280d7aa15 100644
--- a/applications/accounting/widget/InvoiceForms.xml
+++ b/applications/accounting/widget/InvoiceForms.xml
@@ -74,7 +74,7 @@ under the License.
<set field="total"
value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)}"/>
</row-actions>
<field name="invoiceId" widget-style="buttontext" sort-field="true">
- <hyperlink description="${invoiceId}" target="invoiceOverview">
+ <hyperlink description="${invoiceId}" target="viewInvoice">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
@@ -155,7 +155,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<auto-fields-entity entity-name="InvoiceNote"
default-field-type="display"/>
</grid>
- <grid name="InvoiceItems" list-name="invItemAndOrdItems"
separate-columns="true" paginate-target="invoiceOverview"
+ <grid name="InvoiceItems" list-name="invItemAndOrdItems"
separate-columns="true" paginate-target="viewInvoice"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<row-actions>
<set field="quantity" value="${groovy: quantity ?: 1}"
type="BigDecimal"/>
@@ -758,7 +758,7 @@ under the License.
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/>
</row-actions>
<field name="invoiceId" title="${uiLabelMap.CommonInvoice}"
widget-style="buttontext">
- <hyperlink description="${invoiceId}" target="invoiceOverview">
+ <hyperlink description="${invoiceId}" target="viewInvoice">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
@@ -791,7 +791,7 @@ under the License.
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/>
</row-actions>
<field name="invoiceId" title="${uiLabelMap.CommonInvoice}"
widget-style="buttontext">
- <hyperlink description="${invoiceId}" target="invoiceOverview">
+ <hyperlink description="${invoiceId}" target="viewInvoice">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/InvoiceScreens.xml
b/applications/accounting/widget/InvoiceScreens.xml
index 7cfd54de70..7dabb105e5 100644
--- a/applications/accounting/widget/InvoiceScreens.xml
+++ b/applications/accounting/widget/InvoiceScreens.xml
@@ -173,11 +173,11 @@ under the License.
</widgets>
</section>
</screen>
- <screen name="invoiceOverview">
+ <screen name="ViewInvoice">
<section>
<actions>
<set field="titleProperty" value="PageTitleInvoiceOverview"/>
- <set field="tabButtonItem" value="invoiceOverview"/>
+ <set field="tabButtonItem" value="viewInvoice"/>
<set field="helpAnchor" value="_help_for_invoice_overview"/>
<set field="invoiceId" from-field="parameters.invoiceId"/>
<entity-one entity-name="Invoice" value-field="invoice"/>
diff --git a/applications/accounting/widget/PaymentForms.xml
b/applications/accounting/widget/PaymentForms.xml
index 476eac690b..07df18e4e0 100644
--- a/applications/accounting/widget/PaymentForms.xml
+++ b/applications/accounting/widget/PaymentForms.xml
@@ -269,7 +269,7 @@ under the License.
<field name="paymentId"><hidden/></field>
<field name="invoiceId">
<display-entity entity-name="Invoice">
- <sub-hyperlink target="invoiceOverview"
description="[${invoiceId}]">
+ <sub-hyperlink target="viewInvoice"
description="[${invoiceId}]">
<parameter param-name="invoiceId"/>
</sub-hyperlink>
</display-entity>
@@ -308,7 +308,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="paymentId"><hidden/></field>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink description="${invoiceId}" target="invoiceOverview">
+ <hyperlink description="${invoiceId}" target="viewInvoice">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
@@ -420,7 +420,7 @@ under the License.
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink description="${invoiceId}" target="invoiceOverview">
+ <hyperlink description="${invoiceId}" target="viewInvoice">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
@@ -449,7 +449,7 @@ under the License.
</grid>
<form name="AcctgTransAndEntries" type="list"
list-name="AcctgTransAndEntries" extends="AcctgTransAndEntries"
extends-resource="component://accounting/widget/InvoiceForms.xml">
<field name="paymentId"><hidden/></field>
- <field name="invoiceId"><hyperlink description="${invoiceId}"
target="invoiceOverview?invoiceId=${invoiceId}"/></field>
+ <field name="invoiceId"><hyperlink description="${invoiceId}"
target="viewInvoice?invoiceId=${invoiceId}"/></field>
</form>
<form name="ListChecksToPrint" type="multi" list-name="payments"
target="printChecks" separate-columns="true"
@@ -524,7 +524,7 @@ under the License.
<grid name="ListInvoicesByDueDate" list-name="invoicePaymentInfoList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="invoiceId" widget-style="buttontext">
- <hyperlink description="${invoiceId}" target="invoiceOverview">
+ <hyperlink description="${invoiceId}" target="viewInvoice">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/accounting/AccountingInvoiceCpd.xml
b/applications/accounting/widget/accounting/AccountingInvoiceCpd.xml
index 8ed6a60e3c..2ddf299d5f 100644
--- a/applications/accounting/widget/accounting/AccountingInvoiceCpd.xml
+++ b/applications/accounting/widget/accounting/AccountingInvoiceCpd.xml
@@ -116,7 +116,7 @@ under the License.
<ws:section>
<ws:actions>
<ws:set field="titleProperty"
value="PageTitleInvoiceOverview"/>
- <ws:set field="tabButtonItem" value="invoiceOverview"/>
+ <ws:set field="tabButtonItem" value="viewInvoice"/>
<ws:set field="helpAnchor"
value="_help_for_invoice_overview"/>
<ws:set field="invoiceId"
from-field="parameters.invoiceId"/>
<ws:entity-one entity-name="Invoice"
value-field="invoice"/>
@@ -315,7 +315,7 @@ under the License.
<wf:set field="total"
value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)}"/>
</wf:row-actions>
<wf:field name="invoiceId" widget-style="buttontext"
sort-field="true">
- <wf:hyperlink description="${invoiceId}"
target="invoiceOverview">
+ <wf:hyperlink description="${invoiceId}" target="viewInvoice">
<wf:parameter param-name="invoiceId"/>
</wf:hyperlink>
</wf:field>
diff --git a/applications/accounting/widget/ap/forms/InvoiceForms.xml
b/applications/accounting/widget/ap/forms/InvoiceForms.xml
index 578b71cf55..59f04e567c 100644
--- a/applications/accounting/widget/ap/forms/InvoiceForms.xml
+++ b/applications/accounting/widget/ap/forms/InvoiceForms.xml
@@ -41,7 +41,7 @@ under the License.
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/>
</row-actions>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink description="${invoiceId}" target="invoiceOverview">
+ <hyperlink description="${invoiceId}" target="viewInvoice">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/ar/forms/InvoiceForms.xml
b/applications/accounting/widget/ar/forms/InvoiceForms.xml
index ab6f2559f2..b2ed9b5168 100644
--- a/applications/accounting/widget/ar/forms/InvoiceForms.xml
+++ b/applications/accounting/widget/ar/forms/InvoiceForms.xml
@@ -42,7 +42,7 @@ under the License.
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/>
</row-actions>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink description="${invoiceId}" target="invoiceOverview">
+ <hyperlink description="${invoiceId}" target="viewInvoice">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
diff --git a/applications/humanres/widget/forms/EmployeeForms.xml
b/applications/humanres/widget/forms/EmployeeForms.xml
index 9e1a31f5be..8fd76ffc47 100644
--- a/applications/humanres/widget/forms/EmployeeForms.xml
+++ b/applications/humanres/widget/forms/EmployeeForms.xml
@@ -239,7 +239,7 @@
</form>
<grid name="PayrollHistoryList" list-name="payroll" extends="ListInvoices"
extends-resource="component://accounting/widget/InvoiceForms.xml"
paginate-target="PayrollHistory">
<field name="invoiceId" widget-style="buttontext" sort-field="true">
- <hyperlink description="${invoiceId}"
target="/accounting/control/invoiceOverview" target-type="inter-app">
+ <hyperlink description="${invoiceId}"
target="/accounting/control/viewInvoice" target-type="inter-app">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
diff --git a/applications/order/template/order/OrderPaymentInfo.ftl
b/applications/order/template/order/OrderPaymentInfo.ftl
index a4c16737b0..cd734109c3 100644
--- a/applications/order/template/order/OrderPaymentInfo.ftl
+++ b/applications/order/template/order/OrderPaymentInfo.ftl
@@ -78,7 +78,7 @@ under the License.
<td class="label"><label>${uiLabelMap.OrderInvoices}</label></td>
<td>
<#list invoices as invoice>
- <div>${uiLabelMap.CommonNbr}<a href="<@ofbizUrl
controlPath="/accounting/control">invoiceOverview?invoiceId=${invoice}</@ofbizUrl>"
class="buttontext">${invoice}</a>
+ <div>${uiLabelMap.CommonNbr}<a href="<@ofbizUrl
controlPath="/accounting/control">viewInvoice?invoiceId=${invoice}</@ofbizUrl>"
class="buttontext">${invoice}</a>
(<a target="_BLANK" href="<@ofbizUrl
controlPath="/accounting/control">invoice.pdf?invoiceId=${invoice}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonPdf}</a>)</div>
</#list>
</td>
@@ -546,7 +546,7 @@ under the License.
<td> <span
class="label">${uiLabelMap.OrderInvoices}</span></td>
<td>
<#list invoices as invoice>
- <div>${uiLabelMap.CommonNbr}<a href="<@ofbizUrl
controlPath="/accounting/control">invoiceOverview?invoiceId=${invoice}</@ofbizUrl>"
class="buttontext">${invoice}</a>
+ <div>${uiLabelMap.CommonNbr}<a href="<@ofbizUrl
controlPath="/accounting/control">viewInvoice?invoiceId=${invoice}</@ofbizUrl>"
class="buttontext">${invoice}</a>
(<a target="_BLANK" href="<@ofbizUrl
controlPath="/accounting/control">invoice.pdf?invoiceId=${invoice}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonPdf}</a>)</div>
</#list>
</td>
diff --git a/applications/party/widget/partymgr/PartyForms.xml
b/applications/party/widget/partymgr/PartyForms.xml
index 40feb9b16e..7ba6d88410 100644
--- a/applications/party/widget/partymgr/PartyForms.xml
+++ b/applications/party/widget/partymgr/PartyForms.xml
@@ -1102,7 +1102,7 @@ under the License.
</row-actions>
<field name="invoiceId">
<display-entity entity-name="Invoice" description=" "
also-hidden="true">
- <sub-hyperlink target="/accounting/control/invoiceOverview"
description="[${invoiceId}]" target-type="inter-app">
+ <sub-hyperlink target="/accounting/control/viewInvoice"
description="[${invoiceId}]" target-type="inter-app">
<parameter param-name="invoiceId"/>
</sub-hyperlink>
</display-entity>
@@ -1133,7 +1133,7 @@ under the License.
</actions>
<field name="invoiceId">
<display-entity entity-name="Invoice">
- <sub-hyperlink target="/accounting/control/invoiceOverview"
description="[${invoiceId}]" target-type="inter-app">
+ <sub-hyperlink target="/accounting/control/viewInvoice"
description="[${invoiceId}]" target-type="inter-app">
<parameter param-name="invoiceId"/>
</sub-hyperlink>
</display-entity>
diff --git a/applications/product/template/shipment/PackOrder.ftl
b/applications/product/template/shipment/PackOrder.ftl
index 31e6110ff9..91a946c434 100644
--- a/applications/product/template/shipment/PackOrder.ftl
+++ b/applications/product/template/shipment/PackOrder.ftl
@@ -58,7 +58,7 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl
controlPath="/accounting/control">invoiceOverview?invoiceId=${invoiceId}</@ofbizUrl>"
target="_blank" class="buttontext">${invoiceId}</a>
+ ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl
controlPath="/accounting/control">viewInvoice?invoiceId=${invoiceId}</@ofbizUrl>"
target="_blank" class="buttontext">${invoiceId}</a>
(<a href="<@ofbizUrl
controlPath="/accounting/control">invoice.pdf?invoiceId=${invoiceId}</@ofbizUrl>"
target="_blank" class="buttontext">${uiLabelMap.CommonPdf}</a>)
</li>
</#list>
diff --git a/applications/product/template/shipment/VerifyPick.ftl
b/applications/product/template/shipment/VerifyPick.ftl
index dd4e1fa643..02bf4bb9db 100644
--- a/applications/product/template/shipment/VerifyPick.ftl
+++ b/applications/product/template/shipment/VerifyPick.ftl
@@ -39,7 +39,7 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl
controlPath="/accounting/control">invoiceOverview?invoiceId=${invoiceId}</@ofbizUrl>"
target="_blank" class="buttontext">${invoiceId}</a>
+ ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl
controlPath="/accounting/control">viewInvoice?invoiceId=${invoiceId}</@ofbizUrl>"
target="_blank" class="buttontext">${invoiceId}</a>
(<a href="<@ofbizUrl
controlPath="/accounting/control">invoice.pdf?invoiceId=${invoiceId}</@ofbizUrl>"
target="_blank" class="buttontext">${uiLabelMap.CommonPdf}</a>)
</li>
</#list>
diff --git a/applications/product/template/shipment/WeightPackage.ftl
b/applications/product/template/shipment/WeightPackage.ftl
index 868d6437cd..04b9181c21 100644
--- a/applications/product/template/shipment/WeightPackage.ftl
+++ b/applications/product/template/shipment/WeightPackage.ftl
@@ -38,7 +38,7 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl
controlPath="/accounting/control">invoiceOverview?invoiceId=${invoiceId}</@ofbizUrl>"
target="_blank" class="buttontext">${invoiceId}</a>
+ ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl
controlPath="/accounting/control">viewInvoice?invoiceId=${invoiceId}</@ofbizUrl>"
target="_blank" class="buttontext">${invoiceId}</a>
(<a href="<@ofbizUrl
controlPath="/accounting/control">invoice.pdf?invoiceId=${invoiceId}</@ofbizUrl>"
target="_blank" class="buttontext">${uiLabelMap.CommonPdf}</a>)
</li>
</#list>
diff --git a/applications/workeffort/widget/TimesheetForms.xml
b/applications/workeffort/widget/TimesheetForms.xml
index adb0d5b1da..d306874db0 100644
--- a/applications/workeffort/widget/TimesheetForms.xml
+++ b/applications/workeffort/widget/TimesheetForms.xml
@@ -144,7 +144,7 @@ under the License.
</display-entity>
</field>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink description="${invoiceId}"
target="/accounting/control/invoiceOverview" target-type="inter-app">
+ <hyperlink description="${invoiceId}"
target="/accounting/control/viewInvoice" target-type="inter-app">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
