OFBiz › OFBiz - Commits

svn commit: r1668315 - in /ofbiz/branches/release14.12: ./ applications/manufacturing/config/ManufacturingUiLabels.xml applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1668315 - in /ofbiz/branches/release14.12: ./ applications/manufacturing/config/ManufacturingUiLabels.xml applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml

jleroux@apache.org
Author: jleroux
Date: Sat Mar 21 20:25:16 2015
New Revision: 1668315

URL: http://svn.apache.org/r1668315
Log:
"Applied fix from trunk for revision: 1668314  "
------------------------------------------------------------------------
r1668314 | jleroux | 2015-03-21 21:23:22 +0100 (sam., 21 mars 2015) | 6 lines

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/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/branches/release14.12/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 21 20:25:16 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314

Modified: ofbiz/branches/release14.12/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1668315&r1=1668314&r2=1668315&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/branches/release14.12/applications/manufacturing/config/ManufacturingUiLabels.xml Sat Mar 21 20:25:16 2015
@@ -3580,6 +3580,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>
@@ -3852,7 +3866,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>
@@ -3862,6 +3876,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/branches/release14.12/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml?rev=1668315&r1=1668314&r2=1668315&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml (original)
+++ ofbiz/branches/release14.12/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml Sat Mar 21 20:25:16 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>


Free forum by Nabble Edit this page