details: https://code.openbravo.com/erp/devel/pi/rev/80dc9ed3cec0 changeset: 32336:80dc9ed3cec0 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Jun 08 12:39:20 2017 +0200 summary: Fixes Issue 36199. Adds several Units of Measure to the dataset
details: https://code.openbravo.com/erp/devel/pi/rev/cdc61ae0f9ff changeset: 32337:cdc61ae0f9ff user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Jun 08 12:40:07 2017 +0200 summary: Fixes Issue 36200. Adds Uom Conversion Table to the UOM Dataset. details: https://code.openbravo.com/erp/devel/pi/rev/515bcf15a54b changeset: 32338:515bcf15a54b user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Jun 08 12:42:00 2017 +0200 summary: Fixes Issue 36201. Do not allow to edit a conversion rate from a generic UOM * Added an auxilary input to know if there is a generic conversion already * Added a readonly logic based on the previous auxiliary input details: https://code.openbravo.com/erp/devel/pi/rev/01ae69f28d45 changeset: 32339:01ae69f28d45 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Jun 08 12:46:41 2017 +0200 summary: Fixes Issue 36203. Changes definition of some columns * Changes the position of some columns related with Production flow * Set the StoredInSession flag = Y for locator, attribute and uom of the Storage Detail Table diffstat: referencedata/standard/Unit_of_Measure.xml | 1097 ++++++++++++++++++++++- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 + src-db/database/sourcedata/AD_COLUMN.xml | 21 +- src-db/database/sourcedata/AD_DATASET.xml | 2 +- src-db/database/sourcedata/AD_DATASET_TABLE.xml | 14 + 5 files changed, 1132 insertions(+), 13 deletions(-) diffs (truncated from 1345 to 300 lines): diff -r 8838359e3ec1 -r 01ae69f28d45 referencedata/standard/Unit_of_Measure.xml --- a/referencedata/standard/Unit_of_Measure.xml Tue Jun 20 14:31:30 2017 +0000 +++ b/referencedata/standard/Unit_of_Measure.xml Thu Jun 08 12:46:41 2017 +0200 @@ -1,5 +1,820 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ob:Openbravo xmlns:ob="http://www.openbravo.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<?xml version="1.0" encoding="UTF-8"?><ob:Openbravo xmlns:ob="http://www.openbravo.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <UOMConversion id="010C2C92E4394D87BF811BD011F2A015" identifier="Mile"> + <id>010C2C92E4394D87BF811BD011F2A015</id> + <active>true</active> + <uOM id="ADF850C3E6E9413B9F9EEA5C87456073" entity-name="UOM" identifier="Centimeter"/> + <toUOM id="E2DFB5559E414F85BC7C800BF0DD4E14" entity-name="UOM" identifier="Mile"/> + <multipleRateBy>0.0000060</multipleRateBy> + <divideRateBy>160934.4</divideRateBy> + </UOMConversion> + <UOMConversion id="0704A83693954422841AD514528A238A" identifier="Mile"> + <id>0704A83693954422841AD514528A238A</id> + <active>true</active> + <uOM id="F9AD53BEDA3D4A32BECF44030C281EF2" entity-name="UOM" identifier="Inch"/> + <toUOM id="E2DFB5559E414F85BC7C800BF0DD4E14" entity-name="UOM" identifier="Mile"/> + <multipleRateBy>0.000016</multipleRateBy> + <divideRateBy>63360</divideRateBy> + </UOMConversion> + <UOMConversion id="09B5480A5C3C4D64B39E4EA4482BAF5C" identifier="Inch"> + <id>09B5480A5C3C4D64B39E4EA4482BAF5C</id> + <active>true</active> + <uOM id="E2DFB5559E414F85BC7C800BF0DD4E14" entity-name="UOM" identifier="Mile"/> + <toUOM id="F9AD53BEDA3D4A32BECF44030C281EF2" entity-name="UOM" identifier="Inch"/> + <multipleRateBy>63360</multipleRateBy> + <divideRateBy>0.000016</divideRateBy> + </UOMConversion> + <UOMConversion id="0B2184C2381341FEA71849676B4E0DD9" identifier="Millimeter"> + <id>0B2184C2381341FEA71849676B4E0DD9</id> + <active>true</active> + <uOM id="F9AD53BEDA3D4A32BECF44030C281EF2" entity-name="UOM" identifier="Inch"/> + <toUOM id="B648C32ED9304B4A87C5997CB69D7B72" entity-name="UOM" identifier="Millimeter"/> + <multipleRateBy>25.4</multipleRateBy> + <divideRateBy>0.03937</divideRateBy> + </UOMConversion> + <UOMConversion id="0C6BEB4583DB47A4B94B060797F717EB" identifier="Meter"> + <id>0C6BEB4583DB47A4B94B060797F717EB</id> + <active>true</active> + <uOM id="E2DFB5559E414F85BC7C800BF0DD4E14" entity-name="UOM" identifier="Mile"/> + <toUOM id="54E1CF8449474628BEA191E0532EEC3E" entity-name="UOM" identifier="Meter"/> + <multipleRateBy>1609.344</multipleRateBy> + <divideRateBy>0.000621</divideRateBy> + </UOMConversion> + <UOMConversion id="0F3BADDC745B4315816375C943A863D8" identifier="Kilometer"> + <id>0F3BADDC745B4315816375C943A863D8</id> + <active>true</active> + <uOM id="F9AD53BEDA3D4A32BECF44030C281EF2" entity-name="UOM" identifier="Inch"/> + <toUOM id="A8AE303C482B454081EC39ED47377398" entity-name="UOM" identifier="Kilometer"/> + <multipleRateBy>0.000025</multipleRateBy> + <divideRateBy>39370.0787</divideRateBy> + </UOMConversion> + <UOMConversion id="0F4184B04C67493E9DDC2F8D3A66A43F" identifier="Yard"> + <id>0F4184B04C67493E9DDC2F8D3A66A43F</id> + <active>true</active> + <uOM id="A8AE303C482B454081EC39ED47377398" entity-name="UOM" identifier="Kilometer"/> + <toUOM id="53E0B852279845AE8DA2879F18E9B3D9" entity-name="UOM" identifier="Yard"/> + <multipleRateBy>1093.6133</multipleRateBy> + <divideRateBy>0.000914</divideRateBy> + </UOMConversion> + <UOMConversion id="1173082D93424A81B03356255E80DCB6" identifier="Centimeter"> + <id>1173082D93424A81B03356255E80DCB6</id> + <active>true</active> + <uOM id="53E0B852279845AE8DA2879F18E9B3D9" entity-name="UOM" identifier="Yard"/> + <toUOM id="ADF850C3E6E9413B9F9EEA5C87456073" entity-name="UOM" identifier="Centimeter"/> + <multipleRateBy>91.44</multipleRateBy> + <divideRateBy>0.010936</divideRateBy> + </UOMConversion> + <UOMConversion id="148F73BDAB864104A0D80BE1E54C9D63" identifier="Cubic Meter"> + <id>148F73BDAB864104A0D80BE1E54C9D63</id> + <active>true</active> + <uOM id="6CB1469F8167467BABD40DABE043D829" entity-name="UOM" identifier="Gallon (US)"/> + <toUOM id="6B3B437CB42D452FA04E098D52138888" entity-name="UOM" identifier="Cubic Meter"/> + <multipleRateBy>0.004546</multipleRateBy> + <divideRateBy>219.9692</divideRateBy> + </UOMConversion> + <UOMConversion id="1572435CF6124EFD9D1FD9544E53A411" identifier="Yard"> + <id>1572435CF6124EFD9D1FD9544E53A411</id> + <active>true</active> + <uOM id="F59613ADEC7F404E8142FC7477B7C04D" entity-name="UOM" identifier="Foot"/> + <toUOM id="53E0B852279845AE8DA2879F18E9B3D9" entity-name="UOM" identifier="Yard"/> + <multipleRateBy>0.333333</multipleRateBy> + <divideRateBy>3</divideRateBy> + </UOMConversion> + <UOMConversion id="15B9086673464FC79115C5904EEDCCBE" identifier="Foot"> + <id>15B9086673464FC79115C5904EEDCCBE</id> + <active>true</active> + <uOM id="53E0B852279845AE8DA2879F18E9B3D9" entity-name="UOM" identifier="Yard"/> + <toUOM id="F59613ADEC7F404E8142FC7477B7C04D" entity-name="UOM" identifier="Foot"/> + <multipleRateBy>3</multipleRateBy> + <divideRateBy>0.333333</divideRateBy> + </UOMConversion> + <UOMConversion id="17A1E272E90A48429C3F6955864E95DB" identifier="Square Centimeter"> + <id>17A1E272E90A48429C3F6955864E95DB</id> + <active>true</active> + <uOM id="FDFFCA35AB8041F6957989FA93F8C3ED" entity-name="UOM" identifier="Square Meter"/> + <toUOM id="03A1ED8702974DE68E44C5771229D750" entity-name="UOM" identifier="Square Centimeter"/> + <multipleRateBy>10000</multipleRateBy> + <divideRateBy>0.00010</divideRateBy> + </UOMConversion> + <UOMConversion id="1922E4021A9449C3B18E9590AF4AB2E9" identifier="Square Centimeter"> + <id>1922E4021A9449C3B18E9590AF4AB2E9</id> + <active>true</active> + <uOM id="BB118F8584D64FCBB5F897A2EBE56AE8" entity-name="UOM" identifier="Square Foot"/> + <toUOM id="03A1ED8702974DE68E44C5771229D750" entity-name="UOM" identifier="Square Centimeter"/> + <multipleRateBy>929.0304</multipleRateBy> + <divideRateBy>0.001076</divideRateBy> + </UOMConversion> + <UOMConversion id="1C91CA02272D40139164E9D90007B3DC" identifier="Kilometer"> + <id>1C91CA02272D40139164E9D90007B3DC</id> + <active>true</active> + <uOM id="ADF850C3E6E9413B9F9EEA5C87456073" entity-name="UOM" identifier="Centimeter"/> + <toUOM id="A8AE303C482B454081EC39ED47377398" entity-name="UOM" identifier="Kilometer"/> + <multipleRateBy>0.000010</multipleRateBy> + <divideRateBy>100000</divideRateBy> + </UOMConversion> + <UOMConversion id="1FAEF7EE99D543B7AD15A192B23EE84E" identifier="Kilometer"> + <id>1FAEF7EE99D543B7AD15A192B23EE84E</id> + <active>true</active> + <uOM id="53E0B852279845AE8DA2879F18E9B3D9" entity-name="UOM" identifier="Yard"/> + <toUOM id="A8AE303C482B454081EC39ED47377398" entity-name="UOM" identifier="Kilometer"/> + <multipleRateBy>0.000914</multipleRateBy> + <divideRateBy>1093.6133</divideRateBy> + </UOMConversion> + <UOMConversion id="20AD6971415D40849CADBAEACBC8BABE" identifier="Meter"> + <id>20AD6971415D40849CADBAEACBC8BABE</id> + <active>true</active> + <uOM id="ADF850C3E6E9413B9F9EEA5C87456073" entity-name="UOM" identifier="Centimeter"/> + <toUOM id="54E1CF8449474628BEA191E0532EEC3E" entity-name="UOM" identifier="Meter"/> + <multipleRateBy>0.01</multipleRateBy> + <divideRateBy>100</divideRateBy> + </UOMConversion> + <UOMConversion id="2278C20E54674E71A78CC055E7A31D7D" identifier="Foot"> + <id>2278C20E54674E71A78CC055E7A31D7D</id> + <active>true</active> + <uOM id="F9AD53BEDA3D4A32BECF44030C281EF2" entity-name="UOM" identifier="Inch"/> + <toUOM id="F59613ADEC7F404E8142FC7477B7C04D" entity-name="UOM" identifier="Foot"/> + <multipleRateBy>0.083333</multipleRateBy> + <divideRateBy>12</divideRateBy> + </UOMConversion> + <UOMConversion id="274066DB048B4B47A7208C01A2DCCC6A" identifier="Kilogram"> + <id>274066DB048B4B47A7208C01A2DCCC6A</id> + <active>true</active> + <uOM id="BD53EA48AAD04ADB8361B374367E42EB" entity-name="UOM" identifier="Gram"/> + <toUOM id="72BA247D31F745F3AF11F74A5E2CCBEF" entity-name="UOM" identifier="Kilogram"/> + <multipleRateBy>0.001</multipleRateBy> + <divideRateBy>1000</divideRateBy> + </UOMConversion> + <UOMConversion id="2846FA4B938E41A9BBB4DBAA31091D07" identifier="Cubic Meter"> + <id>2846FA4B938E41A9BBB4DBAA31091D07</id> + <active>true</active> + <uOM id="023A83E2F6FB41F3A76A822078AE9F72" entity-name="UOM" identifier="Litre"/> + <toUOM id="6B3B437CB42D452FA04E098D52138888" entity-name="UOM" identifier="Cubic Meter"/> + <multipleRateBy>0.001</multipleRateBy> + <divideRateBy>1000</divideRateBy> + </UOMConversion> + <UOMConversion id="35D7A67AD7844FB4A05A57F1DF80454A" identifier="Millimeter"> + <id>35D7A67AD7844FB4A05A57F1DF80454A</id> + <active>true</active> + <uOM id="F59613ADEC7F404E8142FC7477B7C04D" entity-name="UOM" identifier="Foot"/> + <toUOM id="B648C32ED9304B4A87C5997CB69D7B72" entity-name="UOM" identifier="Millimeter"/> + <multipleRateBy>304.8</multipleRateBy> + <divideRateBy>0.003281</divideRateBy> + </UOMConversion> + <UOMConversion id="36A83692A2DF4C20A66B0985C140476E" identifier="Millimeter"> + <id>36A83692A2DF4C20A66B0985C140476E</id> + <active>true</active> + <uOM id="E2DFB5559E414F85BC7C800BF0DD4E14" entity-name="UOM" identifier="Mile"/> + <toUOM id="B648C32ED9304B4A87C5997CB69D7B72" entity-name="UOM" identifier="Millimeter"/> + <multipleRateBy>1609344</multipleRateBy> + <divideRateBy>0.0000010</divideRateBy> + </UOMConversion> + <UOMConversion id="37C5D05FBF39438CA2382FE0D284D622" identifier="Square Foot"> + <id>37C5D05FBF39438CA2382FE0D284D622</id> + <active>true</active> + <uOM id="FDFFCA35AB8041F6957989FA93F8C3ED" entity-name="UOM" identifier="Square Meter"/> + <toUOM id="BB118F8584D64FCBB5F897A2EBE56AE8" entity-name="UOM" identifier="Square Foot"/> + <multipleRateBy>10.7639</multipleRateBy> + <divideRateBy>0.092903</divideRateBy> + </UOMConversion> + <UOMConversion id="39A364209B0D415C9ECD920ABEEDFE97" identifier="Centimeter"> + <id>39A364209B0D415C9ECD920ABEEDFE97</id> + <active>true</active> + <uOM id="E2DFB5559E414F85BC7C800BF0DD4E14" entity-name="UOM" identifier="Mile"/> + <toUOM id="ADF850C3E6E9413B9F9EEA5C87456073" entity-name="UOM" identifier="Centimeter"/> + <multipleRateBy>160934.4</multipleRateBy> + <divideRateBy>0.0000060</divideRateBy> + </UOMConversion> + <UOMConversion id="40BEF9D1FD3B4872BF3BDA47A8491A97" identifier="Foot"> + <id>40BEF9D1FD3B4872BF3BDA47A8491A97</id> + <active>true</active> + <uOM id="54E1CF8449474628BEA191E0532EEC3E" entity-name="UOM" identifier="Meter"/> + <toUOM id="F59613ADEC7F404E8142FC7477B7C04D" entity-name="UOM" identifier="Foot"/> + <multipleRateBy>3.2808</multipleRateBy> + <divideRateBy>0.304804</divideRateBy> + </UOMConversion> + <UOMConversion id="466CD3F8414340DDBB8AE47D5860EC17" identifier="Square Foot"> + <id>466CD3F8414340DDBB8AE47D5860EC17</id> + <active>true</active> + <uOM id="03A1ED8702974DE68E44C5771229D750" entity-name="UOM" identifier="Square Centimeter"/> + <toUOM id="BB118F8584D64FCBB5F897A2EBE56AE8" entity-name="UOM" identifier="Square Foot"/> + <multipleRateBy>0.001076</multipleRateBy> + <divideRateBy>929.0304</divideRateBy> + </UOMConversion> + <UOMConversion id="469BA1C3F574429F87A045D93AA0E290" identifier="Mile"> + <id>469BA1C3F574429F87A045D93AA0E290</id> + <active>true</active> + <uOM id="54E1CF8449474628BEA191E0532EEC3E" entity-name="UOM" identifier="Meter"/> + <toUOM id="E2DFB5559E414F85BC7C800BF0DD4E14" entity-name="UOM" identifier="Mile"/> + <multipleRateBy>0.000621</multipleRateBy> + <divideRateBy>1609.344</divideRateBy> + </UOMConversion> + <UOMConversion id="49E8E18038AE4D48A06E6A637541D551" identifier="Inch"> + <id>49E8E18038AE4D48A06E6A637541D551</id> + <active>true</active> + <uOM id="B648C32ED9304B4A87C5997CB69D7B72" entity-name="UOM" identifier="Millimeter"/> + <toUOM id="F9AD53BEDA3D4A32BECF44030C281EF2" entity-name="UOM" identifier="Inch"/> + <multipleRateBy>0.03937</multipleRateBy> + <divideRateBy>25.4</divideRateBy> + </UOMConversion> + <UOMConversion id="4A628E1037D6441E9650031AF74538FE" identifier="Litre"> + <id>4A628E1037D6441E9650031AF74538FE</id> + <active>true</active> + <uOM id="6B3B437CB42D452FA04E098D52138888" entity-name="UOM" identifier="Cubic Meter"/> + <toUOM id="023A83E2F6FB41F3A76A822078AE9F72" entity-name="UOM" identifier="Litre"/> + <multipleRateBy>1000</multipleRateBy> + <divideRateBy>0.001</divideRateBy> + </UOMConversion> + <UOMConversion id="4E29C0865FA540299764883884589497" identifier="Gram"> + <id>4E29C0865FA540299764883884589497</id> + <active>true</active> + <uOM id="2EBC93C05D75431E9EEFB29CEC76F244" entity-name="UOM" identifier="Ounce"/> + <toUOM id="BD53EA48AAD04ADB8361B374367E42EB" entity-name="UOM" identifier="Gram"/> + <multipleRateBy>28.3495</multipleRateBy> + <divideRateBy>0.035274</divideRateBy> + </UOMConversion> + <UOMConversion id="51D177F90373443487D241CEAC0F34AC" identifier="Pound"> + <id>51D177F90373443487D241CEAC0F34AC</id> + <active>true</active> + <uOM id="72BA247D31F745F3AF11F74A5E2CCBEF" entity-name="UOM" identifier="Kilogram"/> + <toUOM id="6FA87C4EE1FD4C86940A5F2E47C429DA" entity-name="UOM" identifier="Pound"/> + <multipleRateBy>2.2046</multipleRateBy> + <divideRateBy>0.453597</divideRateBy> + </UOMConversion> + <UOMConversion id="54EF5AB293AF47438F4C9DF54DEF9171" identifier="Foot"> + <id>54EF5AB293AF47438F4C9DF54DEF9171</id> + <active>true</active> + <uOM id="E2DFB5559E414F85BC7C800BF0DD4E14" entity-name="UOM" identifier="Mile"/> + <toUOM id="F59613ADEC7F404E8142FC7477B7C04D" entity-name="UOM" identifier="Foot"/> + <multipleRateBy>5280</multipleRateBy> + <divideRateBy>0.000189</divideRateBy> + </UOMConversion> + <UOMConversion id="5506E265C79B43939A5B8B51FD51689A" identifier="Ounce"> + <id>5506E265C79B43939A5B8B51FD51689A</id> + <active>true</active> + <uOM id="BD53EA48AAD04ADB8361B374367E42EB" entity-name="UOM" identifier="Gram"/> + <toUOM id="2EBC93C05D75431E9EEFB29CEC76F244" entity-name="UOM" identifier="Ounce"/> + <multipleRateBy>0.035274</multipleRateBy> + <divideRateBy>28.3495</divideRateBy> + </UOMConversion> + <UOMConversion id="5527B7AE5EFF4AACA50B4E58B60962E8" identifier="Meter"> + <id>5527B7AE5EFF4AACA50B4E58B60962E8</id> + <active>true</active> + <uOM id="F9AD53BEDA3D4A32BECF44030C281EF2" entity-name="UOM" identifier="Inch"/> + <toUOM id="54E1CF8449474628BEA191E0532EEC3E" entity-name="UOM" identifier="Meter"/> + <multipleRateBy>0.0254</multipleRateBy> + <divideRateBy>39.3701</divideRateBy> + </UOMConversion> + <UOMConversion id="55D5F440B4154AE082540F5421077600" identifier="Kilogram"> + <id>55D5F440B4154AE082540F5421077600</id> + <active>true</active> + <uOM id="6FA87C4EE1FD4C86940A5F2E47C429DA" entity-name="UOM" identifier="Pound"/> + <toUOM id="72BA247D31F745F3AF11F74A5E2CCBEF" entity-name="UOM" identifier="Kilogram"/> + <multipleRateBy>0.453597</multipleRateBy> + <divideRateBy>2.2046</divideRateBy> + </UOMConversion> + <UOMConversion id="58AF3B0391154AB391710FAB6E73DE51" identifier="Meter"> + <id>58AF3B0391154AB391710FAB6E73DE51</id> + <active>true</active> + <uOM id="53E0B852279845AE8DA2879F18E9B3D9" entity-name="UOM" identifier="Yard"/> + <toUOM id="54E1CF8449474628BEA191E0532EEC3E" entity-name="UOM" identifier="Meter"/> + <multipleRateBy>0.914411</multipleRateBy> + <divideRateBy>1.0936</divideRateBy> + </UOMConversion> + <UOMConversion id="5928CBFBD1A34F10B4D27AF32FF0A794" identifier="Gallon (US)"> + <id>5928CBFBD1A34F10B4D27AF32FF0A794</id> + <active>true</active> + <uOM id="BCC599A13E0640A6823A0CF9ED3CDB9E" entity-name="UOM" identifier="Cubic Centimeter"/> + <toUOM id="6CB1469F8167467BABD40DABE043D829" entity-name="UOM" identifier="Gallon (US)"/> + <multipleRateBy>0.000258</multipleRateBy> + <divideRateBy>3875.412</divideRateBy> + </UOMConversion> + <UOMConversion id="697D86016FEA4CE19CADBEE046B8B51A" identifier="Square Inch"> + <id>697D86016FEA4CE19CADBEE046B8B51A</id> + <active>true</active> + <uOM id="BB118F8584D64FCBB5F897A2EBE56AE8" entity-name="UOM" identifier="Square Foot"/> + <toUOM id="40B0E154EF704F839D5A7DEFD721D41A" entity-name="UOM" identifier="Square Inch"/> ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits