svn commit: r1668314 - in /ofbiz/trunk/applications/manufacturing: config/ManufacturingUiLabels.xml script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml

Sat, 21 Mar 2015 13:23:59 -0700 

Author: jleroux
Date: Sat Mar 21 20:23:22 2015
New Revision: 1668314

URL: http://svn.apache.org/r1668314
Log:
A patch from Gil Portenseigne for "Setting the reservation of persons on a 
routing task isn't reflected in the overview of routing tasks" 
https://issues.apache.org/jira/browse/OFBIZ-4897 reported by Pierre Smits 

In this patch i add a control on reservPersons and add it to the entry map of 
updateWorkEffort services.
Being zealous, i'm adding specific labels, existing one where not good for the 
field they were checking.


Modified:
    ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
    
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml

Modified: 
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1668314&r1=1668313&r2=1668314&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml 
(original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Sat 
Mar 21 20:23:22 2015
@@ -3584,6 +3584,20 @@
         <value 
xml:lang="zh">运行设置预计交货日期（setEstimatedDeliveryDates）服务时出错</value>
         <value xml:lang="zh-TW">回合設定é 
è¨ˆäº¤è²¨æ—¥æœŸ(setEstimatedDeliveryDates)服務時出錯</value>
     </property>
+    <property key="ManufacturingProductionRunEstimatedMilliSecondsNotCorrect">
+        <value xml:lang="de">Geschätzte Ausführungszeit einer Einheit für 
Produktionsauftrag ist falsch formatiert</value>
+        <value xml:lang="en">Production Run Estimated Unit Run Time field is 
not formatted correctly</value>
+        <value xml:lang="es">El formato usado para indicar la Tiempo estimado 
unitario no es correcto</value>
+        <value xml:lang="fr">Le champ Temps de production estimé de l'ordre 
de fabrication n'est pas formatté correctement</value>
+        <value xml:lang="it">Ordine di Produzione campo Tempo stimato 
esecuzione non è formattato correttamente</value>
+    </property>
+    <property key="ManufacturingProductionRunEstimatedSetupMillisNotCorrect">
+        <value xml:lang="de">Geschätzte Rüstzeit für Produktionsauftrag ist 
falsch formatiert</value>
+        <value xml:lang="en">Production Run Estimated Setup Time field is not 
formatted correctly</value>
+        <value xml:lang="es">El formato usado para indicar la Tiempo estimado 
de preparación no es correcto</value>
+        <value xml:lang="fr">Le champ Temps d'installation estimé de l'ordre 
de fabrication n'est pas formatté correctement</value>
+        <value xml:lang="it">Ordine di Produzione campo Tempo stimato configur 
non è formattato correttamente</value>
+    </property>
     <property key="ManufacturingProductionRunCosts">
         <value xml:lang="de">Produktionsauftrags-Kosten</value>
         <value xml:lang="en">Production Run Costs</value>
@@ -3860,7 +3874,7 @@
         <value xml:lang="de">Mengenfeld für Produktionsauftrag ist falsch 
formatiert</value>
         <value xml:lang="en">Production Run Quantity field is not formatted 
correctly</value>
         <value xml:lang="es">El formato usado para indicar la cantidad no es 
correcto</value>
-        <value xml:lang="fr">Le champ quantité de l'orde de fabrication n'est 
pas formatté correctement</value>
+        <value xml:lang="fr">Le champ quantité de l'ordre de fabrication 
n'est pas formatté correctement</value>
         <value xml:lang="it">Ordine di Produzione campo Quantità non è 
formattato correttamente</value>
         <value 
xml:lang="ja">生産実行数量の書式が正しくありません</value>
         <value xml:lang="pt-BR">O campo da quantidade da execução de 
produção não está formatado corretamente</value>
@@ -3870,6 +3884,13 @@
         <value xml:lang="zh">生产运行数量域格式不正确</value>
         <value xml:lang="zh-TW">生產運行數量域格式不正確</value>
     </property>
+    <property key="ManufacturingProductionRunReservPersonNotCorrect">
+        <value xml:lang="de">Personen reserviert für Produktionsauftrag ist 
falsch formatiert</value>
+        <value xml:lang="en">Production Run Reserv Persons field is not 
formatted correctly</value>
+        <value xml:lang="es">El formato usado para indicar la Reservar para 
cuántas personas no es correcto</value>
+        <value xml:lang="fr">Le champ Personnes réservées de l'ordre de 
fabrication n'est pas formatté correctement</value>
+        <value xml:lang="it">Ordine di Produzione campo Persone Riserva non è 
formattato correttamente</value>
+    </property>
     <property key="ManufacturingProductionRunStartDateMissing">
         <value xml:lang="de">Start-Datum für Produktionsauftrag fehlt</value>
         <value xml:lang="en">Production Run Start Date is missing</value>

Modified: 
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml?rev=1668314&r1=1668313&r2=1668314&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml
 Sat Mar 21 20:23:22 2015
@@ -48,13 +48,13 @@ under the License.
                 <process field="estimatedSetupMillis">
                     <copy/>
                     <convert type="BigDecimal">
-                        <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingProductionRunQuantityNotCorrect"/>
+                        <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingProductionRunEstimatedSetupMillisNotCorrect"/>
                     </convert>
                 </process>
                 <process field="estimatedMilliSeconds">
                     <copy/>
                     <convert type="BigDecimal">
-                        <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingProductionRunQuantityNotCorrect"/>
+                        <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingProductionRunEstimatedMilliSecondsNotCorrect"/>
                     </convert>
                 </process>
             </simple-map-processor>
@@ -86,13 +86,19 @@ under the License.
                 <process field="estimatedSetupMillis">
                     <copy/>
                     <convert type="BigDecimal">
-                        <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingProductionRunQuantityNotCorrect"/>
+                        <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingProductionRunEstimatedSetupMillisNotCorrect"/>
                     </convert>
                 </process>
                 <process field="estimatedMilliSeconds">
                     <copy/>
                     <convert type="BigDecimal">
-                        <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingProductionRunQuantityNotCorrect"/>
+                        <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingProductionRunEstimatedMilliSecondsNotCorrect"/>
+                    </convert>
+                </process>
+                <process field="reservPersons">
+                    <copy/>
+                    <convert type="BigDecimal">
+                        <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingProductionRunReservPersonNotCorrect"/>
                     </convert>
                 </process>
             </simple-map-processor>

Reply via email to