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
commit d57e889a6a28c3e7b23013a0e1405a77ef38045f
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Wed Jan 26 08:50:32 2022 +0100
Improved: Introduce the option to add the new Customer/Supplier while
placing the quotes in system if they don't exist already (OFBIZ-7456)
Rather extends EditPartyGroup than creating a raw EditPartyGroup2
---
applications/order/widget/ordermgr/QuoteScreens.xml | 2 +-
applications/party/widget/partymgr/PartyForms.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/applications/order/widget/ordermgr/QuoteScreens.xml
b/applications/order/widget/ordermgr/QuoteScreens.xml
index 362f87b..8a04492 100644
--- a/applications/order/widget/ordermgr/QuoteScreens.xml
+++ b/applications/order/widget/ordermgr/QuoteScreens.xml
@@ -247,7 +247,7 @@ under the License.
<include-form name="EditQuote"
location="component://order/widget/ordermgr/QuoteForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PartyCreateNewPartyGroup}">
- <include-form name="EditPartyGroup2"
location="component://party/widget/partymgr/PartyForms.xml"/>
+ <include-form name="EditPartyGroupForNewQuote"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
diff --git a/applications/party/widget/partymgr/PartyForms.xml
b/applications/party/widget/partymgr/PartyForms.xml
index cf94f82..af3a7cd 100644
--- a/applications/party/widget/partymgr/PartyForms.xml
+++ b/applications/party/widget/partymgr/PartyForms.xml
@@ -295,15 +295,15 @@ under the License.
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit
button-type="button"/></field>
- <field name="cancelLink" title=" " widget-style="smallSubmit">
+ <field name="cancelLink" use-when="partyGroup==null" title=" "
widget-style="smallSubmit">
<hyperlink description="${uiLabelMap.CommonCancelDone}"
target="backHome" also-hidden="false"/>
</field>
</form>
- <form name="EditPartyGroup2" type="single" target="createPartyGroup"
default-map-name="partyGroup"
+ <form name="EditPartyGroupForNewQuote" type="single"
target="createPartyGroup" default-map-name="partyGroup" extends="EditPartyGroup"
header-row-style="header-row" default-table-style="basic-table">
- <field name="groupName"><text size="6" maxlength="10"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit
button-type="button"/></field>
+ <field name="cancelLink"><hidden/></field>
+
</form>
<form name="ViewPartyGroup" type="single" default-map-name="lookupGroup">
