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 8aab702 Fixed: Quote "Create New Quote Term" Button URL issues
(OFBIZ-12551)
8aab702 is described below
commit 8aab702d8be188be8683803794e962f42faa25a0
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Fri Feb 11 12:06:37 2022 +0100
Fixed: Quote "Create New Quote Term" Button URL issues (OFBIZ-12551)
When I open up a quote and go to add Quote Terms, the URL of the button
matches
the New Role url.
jleroux: Note and workeffort have the same issue. No need to backport, this
was
due to recent Pierre Smits's "improvement".
Also removes the OrderCreateOrderQuoteNote, no longer used anywhere.
OrderAddNote was rightly used by Pierre because it's more complete (just
<value xml:lang="de-CH">Neue Anmerkung zu Offerte erstellen</value> lost,
anyway I guess <value xml:lang="de">Anmerkung hinzufügen</value> fits more
Thanks: Justine Nowak for report
---
applications/order/config/OrderUiLabels.xml | 12 +-----------
applications/order/widget/ordermgr/OrderMenus.xml | 6 +++---
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/applications/order/config/OrderUiLabels.xml
b/applications/order/config/OrderUiLabels.xml
index df44cc9..f14dde0 100644
--- a/applications/order/config/OrderUiLabels.xml
+++ b/applications/order/config/OrderUiLabels.xml
@@ -3564,16 +3564,6 @@
<value xml:lang="zh-CN">新建报价项</value>
<value xml:lang="zh-TW">新建報價細項</value>
</property>
- <property key="OrderCreateOrderQuoteNote">
- <value xml:lang="ar">خلق ملاحظة عرض سعر جديدة</value>
- <value xml:lang="de">Neue Anmerkung zu Angebot erstellen</value>
- <value xml:lang="de-CH">Neue Anmerkung zu Offerte erstellen</value>
- <value xml:lang="en">Create New Quote Note</value>
- <value xml:lang="fr">Créer une nouvelle note de devis</value>
- <value xml:lang="nl">Nieuwe notitie bij offerte aanmaken</value>
- <value xml:lang="zh">新建询价便笺</value>
- <value xml:lang="zh-TW">新建詢價便箋</value>
- </property>
<property key="OrderCreateOrderQuoteRole">
<value xml:lang="ar">خلق دور عرض سعر جديد</value>
<value xml:lang="de">Neue Angebotsrolle erstellen</value>
@@ -12772,7 +12762,7 @@
<value xml:lang="zh">退货类型历史记录</value>
<value xml:lang="zh-TW">退貨類型歷史</value>
</property>
-
+
<property key="OrderReviewOrder">
<value xml:lang="ar">مراجعة أمر البيع\الشراء</value>
<value xml:lang="de">Auftrag prüfen</value>
diff --git a/applications/order/widget/ordermgr/OrderMenus.xml
b/applications/order/widget/ordermgr/OrderMenus.xml
index 1d6d79b..b2f0cd8 100644
--- a/applications/order/widget/ordermgr/OrderMenus.xml
+++ b/applications/order/widget/ordermgr/OrderMenus.xml
@@ -412,7 +412,7 @@ under the License.
<if-compare operator="equals" value="QUO_CREATED"
field="quote.statusId"/>
</and>
</condition>
- <link target="EditQuoteRole">
+ <link target="createnewquotenote">
<parameter param-name="quoteId" from-field="quote.quoteId"/>
</link>
</menu-item>
@@ -440,7 +440,7 @@ under the License.
<if-compare operator="equals" value="QUO_CREATED"
field="quote.statusId"/>
</and>
</condition>
- <link target="EditQuoteRole">
+ <link target="EditQuoteTerm">
<parameter param-name="quoteId" from-field="quote.quoteId"/>
</link>
</menu-item>
@@ -454,7 +454,7 @@ under the License.
<if-compare operator="equals" value="QUO_CREATED"
field="quote.statusId"/>
</and>
</condition>
- <link target="EditQuoteRole">
+ <link target="AddQuoteWorkEffort">
<parameter param-name="quoteId" from-field="quote.quoteId"/>
</link>
</menu-item>
