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 8c37ca2 Improved: Move edit of Payment Group to SubTabBar
(OFBIZ-12501) (#456)
8c37ca2 is described below
commit 8c37ca2664757344996d47cd4deb330ea2d9753e
Author: Pierre Smits <pierre.sm...@orrtiz.com>
AuthorDate: Tue Jan 18 15:48:14 2022 +0100
Improved: Move edit of Payment Group to SubTabBar (OFBIZ-12501) (#456)
In general, a <object>TabBar menu is intended to give
users access to overviews related to the <object>.
And a <object>SubTabBar menu is intended to give
users access to actions to be performed on the <object>,
like status changes, adding new related records, etc.
The menu-item for editing a payment group is currently
located in the PaymentGroupTabBar menu in AccountingMenus.xml.
The menu item belongs in the PaymentGroupSubTabBar
Improved: AccountingMenus.xml
PaymentGroupTabBar: removed menu item to edit the payment group, additonal
cleanup
PaymentGroupSubTabBar: Added menu iteem to edit the payment group,
additional cleanup
---
applications/accounting/widget/AccountingMenus.xml | 25 +++++++++++++---------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/applications/accounting/widget/AccountingMenus.xml
b/applications/accounting/widget/AccountingMenus.xml
index 3471022..7d4702b 100644
--- a/applications/accounting/widget/AccountingMenus.xml
+++ b/applications/accounting/widget/AccountingMenus.xml
@@ -688,20 +688,13 @@ under the License.
</link>
</menu-item>
</menu>
-
<menu name="PaymentGroupTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="PaymentGroupOverview"
title="${uiLabelMap.AccountingPaymentTabOverview}">
<link target="PaymentGroupOverview">
<parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
</link>
</menu-item>
- <menu-item name="EditPaymentGroup" title="${uiLabelMap.CommonGroup}">
- <condition><not><if-empty
field="paymentGroup.paymentGroupId"/></not></condition>
- <link target="EditPaymentGroup">
- <parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
- </link>
- </menu-item>
- <menu-item name="EditPaymentGroupMember"
title="${uiLabelMap.AccountingGroupMembers}">
+ <menu-item name="EditPaymentGroupMember"
title="${uiLabelMap.CommonPayments}">
<condition><not><if-empty
field="paymentGroup.paymentGroupId"/></not></condition>
<link target="EditPaymentGroupMember">
<parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
@@ -715,13 +708,26 @@ under the License.
<and>
<or>
<if-has-permission permission="ACCOUNTING"
action="_CREATE"/>
- <if-has-permission permission="ACCOUNTING"
action="_UPDATE"/>
</or>
<not><if-empty field="paymentGroup"/></not>
</and>
</condition>
<link target="EditPaymentGroup"/>
</menu-item>
+ <menu-item name="EditPaymentGroup" title="${uiLabelMap.CommonEdit}">
+ <condition>
+ <and>
+ <or>
+ <if-has-permission permission="ACCOUNTING"
action="_CREATE"/>
+ <if-has-permission permission="ACCOUNTING"
action="_UPDATE"/>
+ </or>
+ <not><if-empty field="paymentGroup"/></not>
+ </and>
+ </condition>
+ <link target="EditPaymentGroup">
+ <parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
+ </link>
+ </menu-item>
<menu-item name="depositSlip"
title="${uiLabelMap.AccountingDepositSlip}">
<condition>
<and>
@@ -788,7 +794,6 @@ under the License.
</link>
</menu-item>
</menu>
-
<menu name="FixedAssetMaintTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint"
default-menu-item-name="EditFixedAssetMaint">
<menu-item name="EditFixedAssetMaint"
title="${uiLabelMap.AccountingFixedAssetMaint}">
