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 0249185d53 Improved: ACC- have TaxAuthorityMenus parameterized
(OFBIZ-13034) (#767)
0249185d53 is described below
commit 0249185d539bd7b057542de09005da3a3723742d
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Wed Apr 17 17:28:44 2024 +0200
Improved: ACC- have TaxAuthorityMenus parameterized (OFBIZ-13034) (#767)
Move the menus from hard-coded to parameterized
modified:
- AccountingMenus.xml: added TaxAuthority men(s)
- TaxAuthorityScreens.xml: changed menu location from hard-coded to
parameterized
deleted:
- TaxAuthorityMenus.xml
---
applications/accounting/widget/AccountingMenus.xml | 46 +++++++++++++++
.../accounting/widget/TaxAuthorityMenus.xml | 69 ----------------------
.../accounting/widget/TaxAuthorityScreens.xml | 2 +-
3 files changed, 47 insertions(+), 70 deletions(-)
diff --git a/applications/accounting/widget/AccountingMenus.xml
b/applications/accounting/widget/AccountingMenus.xml
index a94f1922b0..55d6afe2af 100644
--- a/applications/accounting/widget/AccountingMenus.xml
+++ b/applications/accounting/widget/AccountingMenus.xml
@@ -1689,4 +1689,50 @@ under the License.
<link target="AddCompany" link-type="auto"/>
</menu-item>
</menu>
+ <menu name="TaxAuthorityTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ default-menu-item-name="EditTaxAuthority">
+
+ <menu-item name="EditTaxAuthority"
title="${uiLabelMap.AccountingTaxAuthority}">
+ <link target="EditTaxAuthority">
+ <parameter param-name="taxAuthPartyId"/>
+ <parameter param-name="taxAuthGeoId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditTaxAuthorityCategories"
title="${uiLabelMap.ProductCategories}">
+ <link target="EditTaxAuthorityCategories">
+ <parameter param-name="taxAuthPartyId"/>
+ <parameter param-name="taxAuthGeoId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditTaxAuthorityAssocs"
title="${uiLabelMap.CommonAssocs}">
+ <link target="EditTaxAuthorityAssocs">
+ <parameter param-name="taxAuthPartyId"/>
+ <parameter param-name="taxAuthGeoId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditTaxAuthorityGlAccounts"
title="${uiLabelMap.AccountingGlAccs}">
+ <link target="EditTaxAuthorityGlAccounts">
+ <parameter param-name="taxAuthPartyId"/>
+ <parameter param-name="taxAuthGeoId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditTaxAuthorityRateProducts"
title="${uiLabelMap.AccountingProductRates}">
+ <link target="EditTaxAuthorityRateProducts">
+ <parameter param-name="taxAuthPartyId"/>
+ <parameter param-name="taxAuthGeoId"/>
+ </link>
+ </menu-item>
+ <menu-item name="ListTaxAuthorityParties"
title="${uiLabelMap.PartyParties}">
+ <link target="ListTaxAuthorityParties">
+ <parameter param-name="taxAuthPartyId"/>
+ <parameter param-name="taxAuthGeoId"/>
+ </link>
+ </menu-item>
+ <menu-item name="FindTaxAuthorityReport"
title="${uiLabelMap.CommonReport}">
+ <link target="FindTaxAuthorityReport">
+ <parameter param-name="taxAuthPartyId"/>
+ <parameter param-name="taxAuthGeoId"/>
+ </link>
+ </menu-item>
+ </menu>
</menus>
diff --git a/applications/accounting/widget/TaxAuthorityMenus.xml
b/applications/accounting/widget/TaxAuthorityMenus.xml
deleted file mode 100644
index 4b20f9d3a7..0000000000
--- a/applications/accounting/widget/TaxAuthorityMenus.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://ofbiz.apache.org/Widget-Menu";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Menu
http://ofbiz.apache.org/dtds/widget-menu.xsd";>
-
- <menu name="TaxAuthorityTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
- default-menu-item-name="EditTaxAuthority">
-
- <menu-item name="EditTaxAuthority"
title="${uiLabelMap.AccountingTaxAuthority}">
- <link target="EditTaxAuthority">
- <parameter param-name="taxAuthPartyId"/>
- <parameter param-name="taxAuthGeoId"/>
- </link>
- </menu-item>
-
- <menu-item name="EditTaxAuthorityCategories"
title="${uiLabelMap.ProductCategories}">
- <link target="EditTaxAuthorityCategories">
- <parameter param-name="taxAuthPartyId"/>
- <parameter param-name="taxAuthGeoId"/>
- </link>
- </menu-item>
- <menu-item name="EditTaxAuthorityAssocs"
title="${uiLabelMap.CommonAssocs}">
- <link target="EditTaxAuthorityAssocs">
- <parameter param-name="taxAuthPartyId"/>
- <parameter param-name="taxAuthGeoId"/>
- </link>
- </menu-item>
- <menu-item name="EditTaxAuthorityGlAccounts"
title="${uiLabelMap.AccountingGlAccs}">
- <link target="EditTaxAuthorityGlAccounts">
- <parameter param-name="taxAuthPartyId"/>
- <parameter param-name="taxAuthGeoId"/>
- </link>
- </menu-item>
- <menu-item name="EditTaxAuthorityRateProducts"
title="${uiLabelMap.AccountingProductRates}">
- <link target="EditTaxAuthorityRateProducts">
- <parameter param-name="taxAuthPartyId"/>
- <parameter param-name="taxAuthGeoId"/>
- </link>
- </menu-item>
- <menu-item name="ListTaxAuthorityParties"
title="${uiLabelMap.PartyParties}">
- <link target="ListTaxAuthorityParties">
- <parameter param-name="taxAuthPartyId"/>
- <parameter param-name="taxAuthGeoId"/>
- </link>
- </menu-item>
- <menu-item name="FindTaxAuthorityReport"
title="${uiLabelMap.CommonReport}">
- <link target="FindTaxAuthorityReport">
- <parameter param-name="taxAuthPartyId"/>
- <parameter param-name="taxAuthGeoId"/>
- </link>
- </menu-item>
- </menu>
-</menus>
diff --git a/applications/accounting/widget/TaxAuthorityScreens.xml
b/applications/accounting/widget/TaxAuthorityScreens.xml
index 77f4d50379..3e3da2e443 100644
--- a/applications/accounting/widget/TaxAuthorityScreens.xml
+++ b/applications/accounting/widget/TaxAuthorityScreens.xml
@@ -51,7 +51,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu
name="TaxAuthorityTabBar"
location="component://accounting/widget/TaxAuthorityMenus.xml"/>
+ <include-menu
name="TaxAuthorityTabBar" location="${parameters.mainMenuLocation}"/>
<container><link
target="EditTaxAuthority" text="${uiLabelMap.CommonCreate}"
style="buttontext"/></container>
<label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${uiLabelMap.AccountingTaxAuthorityParty} "${taxAuthPartyName.firstName}
${taxAuthPartyName.lastName} ${taxAuthPartyName.groupName}"
[${uiLabelMap.CommonId}:${taxAuthPartyId}], ${uiLabelMap.CommonGeo}
"${taxAuthGeo.geoName}" [${uiLabelMap.CommonId}:${taxAuthGeoId}]
${${extraFunctionName}}"/>
</widgets>
