You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/03/21 21:25:22 UTC
svn commit: r1668317 - in /ofbiz/branches/release13.07: ./
applications/manufacturing/config/ManufacturingUiLabels.xml
applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml
Author: jleroux
Date: Sat Mar 21 20:25:21 2015
New Revision: 1668317
URL: http://svn.apache.org/r1668317
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/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 21 20:25:21 2015
@@ -5,4 +5,4 @@
/ofbiz/branches/jquery:952958-1044489
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release12.04:1557118
-/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1519999,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,1544444,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327,
1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,1612190,16122
02,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1663979,1664602,1664604,16
66633,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265
+/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1519999,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,1544444,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327,
1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,1612190,16122
02,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1663979,1664602,1664604,16
66633,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314
Modified: ofbiz/branches/release13.07/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1668317&r1=1668316&r2=1668317&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/config/ManufacturingUiLabels.xml Sat Mar 21 20:25:21 2015
@@ -3543,6 +3543,20 @@
<value xml:lang="vi">Lá»i khi thá»±c thi dá»ch vụ setEstimatedDeliveryDates</value>
<value xml:lang="zh">è¿è¡è®¾ç½®é¢è®¡äº¤è´§æ¥æï¼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>
@@ -3809,7 +3823,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>
@@ -3819,6 +3833,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/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml?rev=1668317&r1=1668316&r2=1668317&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml Sat Mar 21 20:25:21 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>