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 6ad1c20518 Improved: Move Create Agreement action trigger to
MainActionsMenu (OFBIZ-12917) (#710)
6ad1c20518 is described below
commit 6ad1c20518ad75773fca02ceac3c1d116f097f77
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Tue Feb 27 08:47:46 2024 +0100
Improved: Move Create Agreement action trigger to MainActionsMenu
(OFBIZ-12917) (#710)
* Improved: Move Create Agreement action trigger to MainActionsMenu
(OFBIZ-12917)
On the agreements search/find page and the agreement pages a create trigger
exists. This should move too the MainActionMenu for a unified User Experience.
modified:
- AccountingMenus.xml added menu-item with permission condition regarding
the start of a new agreement
- AgreementScreens.xml - removed container with link target from
CommonAgreementDecorator, and removed decorator-section menu-bar with container
and link target from FindAgreement screen.
* correction accidental removal of '>
---
applications/accounting/widget/AccountingMenus.xml | 8 ++++++++
applications/accounting/widget/AgreementScreens.xml | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/applications/accounting/widget/AccountingMenus.xml
b/applications/accounting/widget/AccountingMenus.xml
index 89a9cb5a69..0df94f9480 100644
--- a/applications/accounting/widget/AccountingMenus.xml
+++ b/applications/accounting/widget/AccountingMenus.xml
@@ -95,6 +95,14 @@ under the License.
</condition>
<link target="EditBillingAccount"/>
</menu-item>
+ <menu-item name="NewAgreement" title="${uiLabelMap.CommonNew}
${uiLabelMap.AccountingAgreement}">
+ <condition>
+ <or>
+ <if-has-permission permission="ACCOUNTING"
action="_CREATE"/>
+ </or>
+ </condition>
+ <link target="EditBillingAccount"/>
+ </menu-item>
</menu>
<menu name="AccountingShortcutAppBar"
title="${uiLabelMap.AccountingManager}">
diff --git a/applications/accounting/widget/AgreementScreens.xml
b/applications/accounting/widget/AgreementScreens.xml
index 4c3910597d..0f2210a5d6 100644
--- a/applications/accounting/widget/AgreementScreens.xml
+++ b/applications/accounting/widget/AgreementScreens.xml
@@ -67,9 +67,6 @@ under the License.
<include-menu
name="AgreementItemTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
- <container style="button-bar">
- <link target="EditAgreement"
text="${uiLabelMap.CommonCreate}" style="buttontext create"/>
- </container>
</widgets>
</section>
<decorator-section-include name="body"/>
@@ -100,11 +97,6 @@ under the License.
</condition>
<widgets>
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
- <decorator-section name="menu-bar">
- <container style="button-bar">
- <link target="EditAgreement"
text="${uiLabelMap.CommonCreate}" style="buttontext create"/>
- </container>
- </decorator-section>
<decorator-section name="search-options">
<include-form name="FindAgreements"
location="component://accounting/widget/AgreementForms.xml"/>
</decorator-section>
