[ofbiz-framework] branch trunk updated: Improved: quote menu

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 5fac980  Improved: quote menu
5fac980 is described below

commit 5fac98022e3a364a0b8eb76881c9428dbd5160b4
Author: Pierre Smits <[hidden email]>
AuthorDate: Wed May 20 08:51:26 2020 +0200

    Improved: quote menu
   
    (OFBIZ-11715)
   
    updated: QuoteTabBar - simplified labels
    updated: moved 'Edit quote' menu item to QuoteSubTabBar
    updated: reordering of menu-items of QuoteTabBar
    updated: various UiLabels used by menu-items in QuoteTabBar
---
 applications/order/config/OrderUiLabels.xml       | 16 ++---
 applications/order/widget/ordermgr/OrderMenus.xml | 74 ++++++++++-------------
 framework/common/config/CommonUiLabels.xml        | 10 ++-
 3 files changed, 49 insertions(+), 51 deletions(-)

diff --git a/applications/order/config/OrderUiLabels.xml b/applications/order/config/OrderUiLabels.xml
index dddda46..8bc0fdc 100644
--- a/applications/order/config/OrderUiLabels.xml
+++ b/applications/order/config/OrderUiLabels.xml
@@ -8260,16 +8260,16 @@
         <value xml:lang="zh-TW">係數值</value>
     </property>
     <property key="OrderOrderQuoteCoefficients">
-        <value xml:lang="de">Angebotskoeffizienten</value>
-        <value xml:lang="de-CH">Offertkoeffizienten</value>
-        <value xml:lang="en">Quote Coefficients</value>
+        <value xml:lang="de">Koeffizienten</value>
+        <value xml:lang="de-CH">Koeffizienten</value>
+        <value xml:lang="en">Coefficients</value>
         <value xml:lang="es">Coeficientes</value>
-        <value xml:lang="fr">Coefficients du devis</value>
-        <value xml:lang="it">Coefficienti Preventivo</value>
+        <value xml:lang="fr">Coefficients</value>
+        <value xml:lang="it">Coefficienti</value>
         <value xml:lang="ja">見積係数</value>
-        <value xml:lang="nl">Offerte coefficiënten</value>
-        <value xml:lang="pt-BR">Coeficientes de cotação</value>
-        <value xml:lang="ro">Coeficienti Oferta</value>
+        <value xml:lang="nl">coefficiënten</value>
+        <value xml:lang="pt-BR">Coeficientes</value>
+        <value xml:lang="ro">Coeficienti</value>
         <value xml:lang="ru">Коэффициенты предложения</value>
         <value xml:lang="th">ตัวลข</value>
         <value xml:lang="vi">Hệ số Báo giá</value>
diff --git a/applications/order/widget/ordermgr/OrderMenus.xml b/applications/order/widget/ordermgr/OrderMenus.xml
index cf74511..d98e9c9 100644
--- a/applications/order/widget/ordermgr/OrderMenus.xml
+++ b/applications/order/widget/ordermgr/OrderMenus.xml
@@ -132,31 +132,12 @@ under the License.
     </menu>
 
     <menu name="QuoteTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
-        <menu-item name="ViewQuote" title="${uiLabelMap.OrderViewQuote}">
+        <menu-item name="ViewQuote" title="${uiLabelMap.CommonQuote}">
             <link target="ViewQuote">
                 <parameter param-name="quoteId" from-field="quote.quoteId"/>
             </link>
         </menu-item>
-
-        <menu-item name="EditQuote" title="${uiLabelMap.OrderOrderQuote}">
-            <condition>
-                <if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
-            </condition>
-            <link target="EditQuote">
-                <parameter param-name="quoteId" from-field="quote.quoteId"/>
-            </link>
-        </menu-item>
-
-        <menu-item name="ListQuoteRoles" title="${uiLabelMap.OrderOrderQuoteRoles}">
-            <condition>
-                <if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
-            </condition>
-            <link target="ListQuoteRoles">
-                <parameter param-name="quoteId" from-field="quote.quoteId"/>
-            </link>
-        </menu-item>
-
-        <menu-item name="ListQuoteItems" title="${uiLabelMap.OrderOrderQuoteItems}">
+        <menu-item name="ListQuoteItems" title="${uiLabelMap.CommonItems}">
             <condition>
                 <if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
             </condition>
@@ -164,17 +145,7 @@ under the License.
                 <parameter param-name="quoteId" from-field="quote.quoteId"/>
             </link>
         </menu-item>
-
-        <menu-item name="ListQuoteNotes" title="${uiLabelMap.OrderOrderQuoteNotes}">
-            <condition>
-                <if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
-            </condition>
-            <link target="ListQuoteNotes">
-                <parameter param-name="quoteId" from-field="quote.quoteId"/>
-            </link>
-        </menu-item>
-
-        <menu-item name="ListQuoteAttributes" title="${uiLabelMap.OrderOrderQuoteAttributes}">
+        <menu-item name="ListQuoteAttributes" title="${uiLabelMap.CommonAttributes}">
             <condition>
                 <if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
             </condition>
@@ -182,7 +153,6 @@ under the License.
                 <parameter param-name="quoteId" from-field="quote.quoteId"/>
             </link>
         </menu-item>
-
         <menu-item name="ListQuoteCoefficients" title="${uiLabelMap.OrderOrderQuoteCoefficients}">
             <condition>
                 <and>
@@ -194,8 +164,7 @@ under the License.
                 <parameter param-name="quoteId" from-field="quote.quoteId"/>
             </link>
         </menu-item>
-
-        <menu-item name="ManageQuotePrices" title="${uiLabelMap.OrderOrderQuotePrices}">
+        <menu-item name="ManageQuotePrices" title="${uiLabelMap.CommonPrices}">
             <condition>
                 <and>
                     <if-has-permission permission="ORDERMGR" action="_QUOTE_PRICE"/>
@@ -206,8 +175,7 @@ under the License.
                 <parameter param-name="quoteId" from-field="quote.quoteId"/>
             </link>
         </menu-item>
-
-        <menu-item name="ListQuoteAdjustments" title="${uiLabelMap.OrderOrderQuoteAdjustments}">
+        <menu-item name="ListQuoteAdjustments" title="${uiLabelMap.CommonAdjustments}">
             <condition>
                 <and>
                     <if-has-permission permission="ORDERMGR" action="_QUOTE_PRICE"/>
@@ -218,8 +186,7 @@ under the License.
                 <parameter param-name="quoteId" from-field="quote.quoteId"/>
             </link>
         </menu-item>
-
-        <menu-item name="ViewQuoteProfit" title="${uiLabelMap.OrderViewQuoteProfit}">
+        <menu-item name="ViewQuoteProfit" title="${uiLabelMap.CommonProfit}">
             <condition>
                 <if-has-permission permission="ORDERMGR" action="_QUOTE_PRICE"/>
             </condition>
@@ -227,8 +194,7 @@ under the License.
                 <parameter param-name="quoteId" from-field="quote.quoteId"/>
             </link>
         </menu-item>
-
-        <menu-item name="QuoteWorkEfforts" title="${uiLabelMap.OrderOrderQuoteWorkEfforts}">
+        <menu-item name="QuoteWorkEfforts" title="${uiLabelMap.CommonWorkEfforts}">
             <condition>
                 <if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
             </condition>
@@ -236,7 +202,23 @@ under the License.
                 <parameter param-name="quoteId" from-field="quote.quoteId"/>
             </link>
         </menu-item>
-        <menu-item name="QuoteTerms" title="${uiLabelMap.OrderOrderQuoteTerms}">
+        <menu-item name="ListQuoteNotes" title="${uiLabelMap.CommonNotes}">
+            <condition>
+                <if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
+            </condition>
+            <link target="ListQuoteNotes">
+                <parameter param-name="quoteId" from-field="quote.quoteId"/>
+            </link>
+        </menu-item>
+        <menu-item name="ListQuoteRoles" title="${uiLabelMap.CommonRoles}">
+            <condition>
+                <if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
+            </condition>
+            <link target="ListQuoteRoles">
+                <parameter param-name="quoteId" from-field="quote.quoteId"/>
+            </link>
+        </menu-item>
+        <menu-item name="QuoteTerms" title="${uiLabelMap.PartyTerms}">
             <condition>
                 <if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
             </condition>
@@ -248,6 +230,14 @@ under the License.
 
     <menu name="QuoteSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
         menu-container-style="button-bar button-style-2">
+        <menu-item name="EditQuote" title="${uiLabelMap.CommonEdit}">
+            <condition>
+                <if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
+            </condition>
+            <link target="EditQuote">
+                <parameter param-name="quoteId" from-field="quote.quoteId"/>
+            </link>
+        </menu-item>
         <menu-item name="quoteReport" title="${uiLabelMap.CommonPdf}">
             <link target="QuoteReport" target-window="_BLANK">
                 <parameter param-name="quoteId" from-field="quote.quoteId"/>
diff --git a/framework/common/config/CommonUiLabels.xml b/framework/common/config/CommonUiLabels.xml
index b761ce9..41e5547 100644
--- a/framework/common/config/CommonUiLabels.xml
+++ b/framework/common/config/CommonUiLabels.xml
@@ -895,6 +895,14 @@
         <value xml:lang="zh-CN">應用</value>
         <value xml:lang="zh-TW">應用程式</value>
     </property>
+    <property key="CommonApplication">
+        <value xml:lang="de">Anwendung</value>
+        <value xml:lang="en">Applications</value>
+        <value xml:lang="fr">Application</value>
+        <value xml:lang="hi-IN">एप्प्लिकेशन्स</value>
+        <value xml:lang="it">Applicazione</value>
+        <value xml:lang="nl">Toepassing</value>
+    </property>
     <property key="CommonApply">
         <value xml:lang="ar">تطبيق</value>
         <value xml:lang="cs">Použít</value>
@@ -13323,7 +13331,7 @@
         <value xml:lang="zh">人工服务</value>
     </property>
     <property key="CommonWorkEfforts">
-        <value xml:lang="en">Work Effort</value>
+        <value xml:lang="en">Work Efforts</value>
         <value xml:lang="nl">Activiteiten</value>
         <value xml:lang="zh">人工服务</value>
     </property>