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 a4602d3 Improved: Payment Group Common Decorator (OFBIZ-12463) (#438)
a4602d3 is described below
commit a4602d33fc913265e5da6e81c971891a9ca8de69
Author: Pierre Smits <pierre.sm...@orrtiz.com>
AuthorDate: Tue Jan 18 11:20:23 2022 +0100
Improved: Payment Group Common Decorator (OFBIZ-12463) (#438)
title of a payment group is shown below its menu(s)
Modified: CommonScreens.xml
- restructured CommonPaymentGroupDecorator, additional clean-up
---
applications/accounting/widget/CommonScreens.xml | 30 ++++--------------------
1 file changed, 5 insertions(+), 25 deletions(-)
diff --git a/applications/accounting/widget/CommonScreens.xml
b/applications/accounting/widget/CommonScreens.xml
index 5840307..442ffa4 100644
--- a/applications/accounting/widget/CommonScreens.xml
+++ b/applications/accounting/widget/CommonScreens.xml
@@ -30,7 +30,6 @@ under the License.
<property-map resource="WorkEffortUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="ManufacturingUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
-
<set field="layoutSettings.companyName"
from-field="uiLabelMap.AccountingCompanyName" global="true"/>
<set field="layoutSettings.companySubtitle"
from-field="uiLabelMap.AccountingCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an
application specific logo; if not set,
@@ -104,7 +103,6 @@ under the License.
</widgets>
</section>
</screen>
-
<screen name="CommonPaymentDecorator">
<section>
<actions>
@@ -126,7 +124,6 @@ under the License.
</decorator-section>
<decorator-section name="body">
<section>
- <!-- do check for ACCOUNTING, _VIEW permission -->
<condition>
<if-service-permission
service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
@@ -153,7 +150,6 @@ under the License.
</widgets>
</section>
</screen>
-
<screen name="CommonPaymentGroupDecorator">
<section>
<actions>
@@ -176,29 +172,21 @@ under the License.
</and>
</condition>
<widgets>
+ <label
style="h1">${uiLabelMap.AccountingPaymentGroup}: ${paymentGroupId}</label>
<include-menu name="PaymentGroupTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ <include-menu name="PaymentGroupSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
+ <fail-widgets>
+ <label
style="h1">${uiLabelMap.AccountingNewPaymentGroup}</label>
+ </fail-widgets>
</section>
</decorator-section>
<decorator-section name="body">
<section>
- <!-- do check for ACCOUNTING, _VIEW permission -->
<condition>
<if-service-permission
service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <section>
- <condition>
- <not><if-empty
field="paymentGroup"/></not>
- </condition>
- <widgets>
- <include-menu
name="PaymentGroupSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
- <label
style="h1">${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${paymenGroup.paymentGroupName} [${paymentGroupId}]</label>
- </widgets>
- <fail-widgets>
- <label
style="h1">${uiLabelMap.AccountingNewPaymentGroup}</label>
- </fail-widgets>
- </section>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -210,7 +198,6 @@ under the License.
</widgets>
</section>
</screen>
-
<screen name="CommonPartyDecorator">
<section>
<actions>
@@ -243,7 +230,6 @@ under the License.
</widgets>
</section>
</screen>
-
<screen name="CommonOrganizationAccountingReportsDecorator">
<section>
<actions>
@@ -263,7 +249,6 @@ under the License.
</widgets>
</section>
</screen>
-
<screen name="CommonAdminChecksDecorator">
<section>
<actions>
@@ -284,7 +269,6 @@ under the License.
</widgets>
</section>
</screen>
-
<screen name="main">
<section>
<condition>
@@ -325,7 +309,6 @@ under the License.
</widgets>
</section>
</screen>
-
<screen name="creditCardFields">
<section>
<widgets>
@@ -333,7 +316,6 @@ under the License.
</widgets>
</section>
</screen>
-
<screen name="GlobalGLSettingsDecorator">
<section>
<actions>
@@ -352,7 +334,6 @@ under the License.
</widgets>
</section>
</screen>
-
<screen name="CommonInvoiceDecorator"><!-- used for invoice commission
runs -->
<section>
<widgets>
@@ -360,5 +341,4 @@ under the License.
</widgets>
</section>
</screen>
-
</screens>
