svn commit: r1609186 - in /ofbiz/branches/release12.04: ./ applications/manufacturing/config/ManufacturingUiLabels.xml applications/manufacturing/widget/manufacturing/JobshopScreens.xml

[jacopoc]

Author: jacopoc
Date: Wed Jul  9 14:43:48 2014
New Revision: 1609186

URL: http://svn.apache.org/r1609186
Log:
Applied fix from trunk for revision: 1609184
===

Improved labels of production run associations: thanks to Pierre Smits for the contribution in OFBIZ-5527 (I have modified the Italian labels).


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/branches/release12.04/applications/manufacturing/widget/manufacturing/JobshopScreens.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1609184

Modified: ofbiz/branches/release12.04/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1609186&r1=1609185&r2=1609186&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/branches/release12.04/applications/manufacturing/config/ManufacturingUiLabels.xml Wed Jul  9 14:43:48 2014
@@ -1373,12 +1373,13 @@
         <value xml:lang="zh">交付日期</value>
         <value xml:lang="zh_TW">交付日期</value>
     </property>
-    <property key="ManufacturingDependentWorkEfforts">
+    <property key="ManufacturingSucceedingProductionRun">
         <value xml:lang="de">Abhängige Produktionsaufträge</value>
-        <value xml:lang="en">Dependent Production Runs</value>
+        <value xml:lang="en">Succeeding Production Run(s)</value>
         <value xml:lang="es">Esfuerzos de trabajo dependientes</value>
         <value xml:lang="fr">Exécution de production dépendantes</value>
-        <value xml:lang="it">Ordini di produzione dipendenti</value>
+        <value xml:lang="it">Ordini di produzione successivi</value>
+        <value xml:lang="nl">Opvolgende productierun(s)</value>
         <value xml:lang="pt_BR">Execuções de produção dependentes</value>
         <value xml:lang="ro">Comenzi lansate in Productie?</value>
         <value xml:lang="th">ขึ้นอยู่กับการผลิตสินค้า</value>
@@ -2260,12 +2261,13 @@
         <value xml:lang="zh">生产管理应用</value>
         <value xml:lang="zh_TW">生產管理應用</value>
     </property>
-    <property key="ManufacturingMandatoryWorkEfforts">
+    <property key="ManufacturingPrecedingProductionRun">
         <value xml:lang="de">Erforderliche Produktionsaufträge</value>
-        <value xml:lang="en">Mandatory Production Runs</value>
+        <value xml:lang="en">Preceding Production Run(s)</value>
         <value xml:lang="es">Órdenes de producción obligatorias</value>
         <value xml:lang="fr">Cadences de production obligatoires</value>
-        <value xml:lang="it">Cicli Produzione Obbligatori</value>
+        <value xml:lang="it">Cicli Produzione Precedenti</value>
+        <value xml:lang="nl">Voorafgaande productierun(s)</value>
         <value xml:lang="pt_BR">Execuções de produção obrigatórias</value>
         <value xml:lang="ro">Cicluri de Productie Obligatorii</value>
         <value xml:lang="th">คำสั่งในการผลิต</value>

Modified: ofbiz/branches/release12.04/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1609186&r1=1609185&r2=1609186&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ ofbiz/branches/release12.04/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Wed Jul  9 14:43:48 2014
@@ -116,7 +116,7 @@ under the License.
                                 <not><if-empty field="mandatoryWorkEfforts"/></not>
                             </condition>
                             <widgets>
-                                <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}">
+                                <screenlet title="${uiLabelMap.ManufacturingPrecedingProductionRun}">
                                     <include-form name="mandatoryWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
                                 </screenlet>
                             </widgets>
@@ -126,7 +126,7 @@ under the License.
                                 <not><if-empty field="dependentWorkEfforts"/></not>
                             </condition>
                             <widgets>
-                                <screenlet title="${uiLabelMap.ManufacturingDependentWorkEfforts}">
+                                <screenlet title="${uiLabelMap.ManufacturingSucceedingProductionRun}">
                                     <include-form name="dependentWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
                                 </screenlet>
                             </widgets>