svn commit: r1848923 - in /ofbiz/ofbiz-framework/trunk: applications/humanres/widget/ applications/party/widget/partymgr/ applications/product/widget/catalog/ framework/common/config/

Author: jleroux
Date: Fri Dec 14 10:38:18 2018
New Revision: 1848923

URL: http://svn.apache.org/viewvc?rev=1848923&view=rev
Log:
Improved: Splitting CommonRate and CommonProductRating
(OFBIZ-3844)

Simplifies and adds comments for clarity

Modified:
    ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
    ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml
    ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml
    ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=1848923&r1=1848922&r2=1848923&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml Fri Dec 14 10:38:18 2018
@@ -159,7 +159,7 @@
                 <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <include-menu name="EmplPositionTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
-                        <screenlet id="AddEmplPositionTypeRatePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmplPositionType} ${uiLabelMap.CommonRatioRate}" collapsible="true">
+                        <screenlet id="AddEmplPositionTypeRatePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmplPositionType} ${uiLabelMap.CommonRate}" collapsible="true">
                             <include-form name="AddEmplPositionTypeRate" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
                         </screenlet>
                             <include-form name="ListEmplPositionTypeRates" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=1848923&r1=1848922&r2=1848923&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml Fri Dec 14 10:38:18 2018
@@ -80,7 +80,7 @@
                 <parameter param-name="partyId"/>
             </link>
         </menu-item>
-        <menu-item name="EditPartyRates" title="${uiLabelMap.CommonRatioRates}">
+        <menu-item name="EditPartyRates" title="${uiLabelMap.CommonRates}">
             <link target="EditPartyRates">
                 <parameter param-name="partyId"/>
             </link>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1848923&r1=1848922&r2=1848923&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml Fri Dec 14 10:38:18 2018
@@ -315,7 +315,7 @@ under the License.
                 <sort-field name="inventoryMessage"/>
                 <sort-field name="lotIdFilledIn"/>
             </field-group>
-            <field-group title="${uiLabelMap.CommonAssessRate}" collapsible="true" initially-collapsed="true">
+            <field-group title="${uiLabelMap.CommonProductRating}" collapsible="true" initially-collapsed="true">
                 <sort-field name="ratingTypeEnum"/>
                 <sort-field name="productRating"/>
             </field-group>

Modified: ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml?rev=1848923&r1=1848922&r2=1848923&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml Fri Dec 14 10:38:18 2018
@@ -9119,6 +9119,10 @@
         <value xml:lang="nl">Product</value>
         <value xml:lang="zh">产品</value>
     </property>
+    <property key="CommonProductRating"><!--  Used to demark the section where ProductRating setting are made. -->
+        <value xml:lang="de">Bewertung</value>
+        <value xml:lang="en">Rating</value>
+    </property>    
     <property key="CommonProfile">
         <value xml:lang="ar">خصائص</value>
         <value xml:lang="cs">Profil</value>
@@ -9398,7 +9402,7 @@
     <property key="CommonQuoteTerms">
         <value xml:lang="en">Quote Terms</value>
     </property>
-    <property key="CommonRatioRate">
+    <property key="CommonRate"> <!--  Rate as a tariff or day rate -->
         <value xml:lang="ar">النسبة</value>
         <value xml:lang="cs">Sazba</value>
         <value xml:lang="de">Satz</value>
@@ -9419,7 +9423,7 @@
         <value xml:lang="zh-CN">等级</value>
         <value xml:lang="zh-TW">評等</value>
     </property>
-    <property key="CommonRatioRates">
+    <property key="CommonRates"> <!--  Rate as a tariff or day rate -->
         <value xml:lang="ar">النسب</value>
         <value xml:lang="cs">Sazby</value>
         <value xml:lang="de">Sätze</value>
@@ -9440,10 +9444,6 @@
         <value xml:lang="zh-CN">费用</value>
         <value xml:lang="zh-TW">評等</value>
     </property>
-    <property key="CommonAssessRate">
-        <value xml:lang="de">Bewertung</value>
-        <value xml:lang="en">Rating</value>
-    </property>    
     <property key="CommonReady">
         <value xml:lang="ar">جاهز</value>
         <value xml:lang="cs">Připravený</value>