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 8033f46c28 Improved: Move create new BillingAccount trigger to
MainActionMenu (OFBIZ-12907) (#702)
8033f46c28 is described below
commit 8033f46c284a3a294311853c6d3d3aca7bc24ec4
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Feb 19 18:48:01 2024 +0100
Improved: Move create new BillingAccount trigger to MainActionMenu
(OFBIZ-12907) (#702)
Removes duplicated create label
Also removes few trailing spaces (automated)
---
applications/accounting/widget/AccountingMenus.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/applications/accounting/widget/AccountingMenus.xml
b/applications/accounting/widget/AccountingMenus.xml
index 995476a7aa..10b3f8cc44 100644
--- a/applications/accounting/widget/AccountingMenus.xml
+++ b/applications/accounting/widget/AccountingMenus.xml
@@ -87,7 +87,7 @@ under the License.
</condition>
<link target="EditPaymentGroup"/>
</menu-item>
- <menu-item name="NewBillingAccount" title="${uiLabelMap.CommonCreate}
${uiLabelMap.AccountingNewBillingAccount}">
+ <menu-item name="NewBillingAccount"
title="${uiLabelMap.AccountingNewBillingAccount}">
<condition>
<or>
<if-has-permission permission="ACCOUNTING"
action="_CREATE"/>
@@ -257,7 +257,7 @@ under the License.
<link target="CommissionRun"/>
</menu-item>
</menu>
-
+
<menu name="InvoiceSubTabBar" menu-container-style="button-bar
button-style-2" default-selected-style="selected">
<menu-item name="editInvoice" title="${uiLabelMap.CommonEdit}">
<condition>
@@ -1351,7 +1351,7 @@ under the License.
<link target="CostCenters"/>
</menu-item>
</menu>
-
+
<menu name="AgreementTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="AgreementMain"
title="${uiLabelMap.AccountingAgreement}">
<link target="EditAgreement">
@@ -1524,7 +1524,7 @@ under the License.
<link target="ManualTransaction"/>
</menu-item>
</menu>
-
+
<menu name="PaymentGatewayConfigTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="paymentGatewayConfigTab"
title="${uiLabelMap.AccountingPaymentGatewayConfig}">
<link target="FindPaymentGatewayConfig"/>
@@ -1533,12 +1533,12 @@ under the License.
<link target="FindPaymentGatewayConfigTypes"/>
</menu-item>
</menu>
- <menu name="GlAccountCategoryTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ <menu name="GlAccountCategoryTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="tabButtonItem2">
<menu-item name="EditGlAccountCategory"
title="${uiLabelMap.FormFieldTitle_glAccountCategory}">
<link target="EditGlAccountCategory">
<parameter param-name="glAccountCategoryId"/>
- <parameter param-name="glAccountCategoryTypeId"/>
+ <parameter param-name="glAccountCategoryTypeId"/>
</link>
</menu-item>
<menu-item name="EditGlAccountCategoryMember"
title="${uiLabelMap.FormFieldTitle_glAccountCategoryMember}">
@@ -1635,7 +1635,7 @@ under the License.
<and>
<and>
<if-compare field="finAccount.statusId"
operator="not-equals" value="FNACT_MANFROZEN"/>
- <if-compare field="finAccount.statusId"
operator="not-equals" value="FNACT_CANCELLED"/>
+ <if-compare field="finAccount.statusId"
operator="not-equals" value="FNACT_CANCELLED"/>
</and>
<or>
<not><if-empty field="glReconciliationId"/></not>
