diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
index 7173b8492ab..96ff81cc0d1 100644
--- a/openerp/addons/base/currency_data.xml
+++ b/openerp/addons/base/currency_data.xml
@@ -9,7 +9,6 @@
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="position">before</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateUSD" model="res.currency.rate">
             <field name="rate">1.2834</field>
@@ -23,7 +22,6 @@
             <field name="symbol">Bs.F</field>
             <field name="rounding">0.0001</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateVEF" model="res.currency.rate">
             <field name="rate">5.864</field>
@@ -36,7 +34,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCAD" model="res.currency.rate">
             <field name="rate">1.3388</field>
@@ -50,7 +47,6 @@
             <field name="symbol">CHF</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCHF" model="res.currency.rate">
             <field name="rate">1.3086</field>
@@ -63,7 +59,6 @@
             <field name="symbol">R$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBRL" model="res.currency.rate">
             <field name="rate">2.2344</field>
@@ -76,7 +71,6 @@
             <field name="symbol">¥</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCNY" model="res.currency.rate">
             <field name="rate">8.7556</field>
@@ -90,7 +84,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCOP" model="res.currency.rate">
             <field name="rate">2933.8378</field>
@@ -103,7 +96,6 @@
             <field name="symbol">Kč</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCZK" model="res.currency.rate">
             <field name="rate">26.5634</field>
@@ -116,7 +108,6 @@
             <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateDKK" model="res.currency.rate">
             <field name="rate">7.4445</field>
@@ -130,7 +121,6 @@
             <field name="symbol">Ft</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateHUF" model="res.currency.rate">
             <field name="rate">271.5621</field>
@@ -143,7 +133,6 @@
             <field name="symbol">Rp</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateIDR1" model="res.currency.rate">
             <field name="rate">14352.00</field>
@@ -161,7 +150,6 @@
             <field name="symbol">Ls</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateLVL" model="res.currency.rate">
             <field name="rate">0.7086</field>
@@ -174,7 +162,6 @@
             <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateNOK" model="res.currency.rate">
             <field name="rate">7.8668</field>
@@ -187,7 +174,6 @@
             <field name="symbol">XPF</field>
             <field name="rounding">1.00</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateXPF" model="res.currency.rate">
             <field name="rate">119.331742</field>
@@ -200,7 +186,6 @@
             <field name="symbol">B/.</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="ratePAB" model="res.currency.rate">
             <field name="rate">1.2676</field>
@@ -213,7 +198,6 @@
             <field name="symbol">zł</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="ratePLN" model="res.currency.rate">
             <field name="rate">4.1005</field>
@@ -226,7 +210,6 @@
             <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSEK" model="res.currency.rate">
             <field name="rate">10.3004</field>
@@ -239,7 +222,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateARS" model="res.currency.rate">
             <field name="rate">5.0881</field>
@@ -252,7 +234,6 @@
             <field name="symbol">₹</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateINR" model="res.currency.rate">
             <field name="rate">59.9739</field>
@@ -265,7 +246,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateAUD" model="res.currency.rate">
             <field name="rate">1.4070</field>
@@ -278,7 +258,6 @@
             <field name="symbol">₴</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateUAH" model="res.currency.rate">
             <field name="rate">10.1969</field>
@@ -291,7 +270,6 @@
             <field name="symbol">₫</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateVND" model="res.currency.rate">
             <field name="rate">26330.01</field>
@@ -304,7 +282,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateHKD" model="res.currency.rate">
             <field name="rate">11.1608</field>
@@ -317,7 +294,6 @@
             <field name="symbol">¥</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateJPY" model="res.currency.rate">
             <field name="rate">133.62</field>
@@ -330,7 +306,6 @@
             <field name="symbol">лв</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBGN" model="res.currency.rate">
             <field name="rate">1.9558</field>
@@ -343,7 +318,6 @@
             <field name="symbol">Lt</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateLTL" model="res.currency.rate">
             <field name="rate">3.4528</field>
@@ -356,7 +330,6 @@
             <field name="symbol">lei</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateRON" model="res.currency.rate">
             <field name="rate">4.2253</field>
@@ -369,7 +342,6 @@
             <field name="symbol">kn</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateHRK" model="res.currency.rate">
             <field name="rate">7.2936</field>
@@ -382,7 +354,6 @@
             <field name="symbol">руб</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateRUB" model="res.currency.rate">
             <field name="rate">43.16</field>
@@ -395,7 +366,6 @@
             <field name="symbol">TL</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateTRY" model="res.currency.rate">
             <field name="rate">2.1411</field>
@@ -408,7 +378,6 @@
             <field name="symbol">₩</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateKRW" model="res.currency.rate">
             <field name="rate">1662.37</field>
@@ -421,7 +390,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMXN" model="res.currency.rate">
             <field name="rate">18.6664</field>
@@ -434,7 +402,6 @@
             <field name="symbol">RM</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMYR" model="res.currency.rate">
             <field name="rate">4.8887</field>
@@ -447,7 +414,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateNZD" model="res.currency.rate">
             <field name="rate">1.9764</field>
@@ -460,7 +426,6 @@
             <field name="symbol">Php</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="ratePHP" model="res.currency.rate">
             <field name="rate">66.1</field>
@@ -473,7 +438,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSGD" model="res.currency.rate">
             <field name="rate">2.0126</field>
@@ -486,7 +450,6 @@
             <field name="symbol">R</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateZAR" model="res.currency.rate">
             <field name="rate">10.5618</field>
@@ -515,7 +478,6 @@
             <field name="symbol">Rs</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMUR" model="res.currency.rate">
             <field name="rate">40.28</field>
@@ -528,7 +490,6 @@
             <field name="symbol">CFA</field>
             <field name="rounding">1</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateXOF" model="res.currency.rate">
            <field name="rate">655.957</field>
@@ -541,7 +502,6 @@
             <field name="symbol">FCFA</field>
             <field name="rounding">1</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateXAF" model="res.currency.rate">
            <field name="rate">655.957</field>
@@ -554,7 +514,6 @@
             <field name="symbol">USh</field>
             <field name="rounding">1</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateUGX" model="res.currency.rate">
             <field name="rate">3401.91388</field>
@@ -567,7 +526,6 @@
             <field name="symbol">L</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateHNL" model="res.currency.rate">
             <field name="rate">25</field>
@@ -580,7 +538,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCLP" model="res.currency.rate">
             <field name="rate">710</field>
@@ -593,7 +550,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateUYU" model="res.currency.rate">
             <field name="currency_id" ref="UYU" />
@@ -606,7 +562,6 @@
             <field name="symbol">Afs</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateAFN" model="res.currency.rate">
             <field name="currency_id" ref="AFN" />
@@ -619,7 +574,6 @@
             <field name="symbol">Kz</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateAOA" model="res.currency.rate">
             <field name="currency_id" ref="AOA" />
@@ -632,7 +586,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateXCD" model="res.currency.rate">
             <field name="currency_id" ref="XCD" />
@@ -645,7 +598,6 @@
             <field name="symbol">դր.</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateAMD" model="res.currency.rate">
             <field name="currency_id" ref="AMD" />
@@ -658,7 +610,6 @@
             <field name="symbol">Afl.</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateAWG" model="res.currency.rate">
             <field name="currency_id" ref="AWG" />
@@ -671,7 +622,6 @@
             <field name="symbol">m</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateAZN" model="res.currency.rate">
             <field name="currency_id" ref="AZN" />
@@ -684,7 +634,6 @@
             <field name="symbol">B$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBSD" model="res.currency.rate">
             <field name="currency_id" ref="BSD" />
@@ -697,7 +646,6 @@
             <field name="symbol">BD</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBHD" model="res.currency.rate">
             <field name="currency_id" ref="BHD" />
@@ -710,7 +658,6 @@
             <field name="symbol">৳</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBDT" model="res.currency.rate">
             <field name="currency_id" ref="BDT" />
@@ -723,7 +670,6 @@
             <field name="symbol">Bds$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBBD" model="res.currency.rate">
             <field name="currency_id" ref="BBD" />
@@ -736,7 +682,6 @@
             <field name="symbol">BR</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBYR" model="res.currency.rate">
             <field name="currency_id" ref="BYR" />
@@ -749,7 +694,6 @@
             <field name="symbol">BZ$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBZD" model="res.currency.rate">
             <field name="currency_id" ref="BZD" />
@@ -762,7 +706,6 @@
             <field name="symbol">BD$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBMD" model="res.currency.rate">
             <field name="currency_id" ref="BMD" />
@@ -775,7 +718,6 @@
             <field name="symbol">Nu.</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBTN" model="res.currency.rate">
             <field name="currency_id" ref="BTN" />
@@ -788,7 +730,6 @@
             <field name="symbol">Bs.</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBOB" model="res.currency.rate">
             <field name="currency_id" ref="BOB" />
@@ -801,7 +742,6 @@
             <field name="symbol">KM</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBAM" model="res.currency.rate">
             <field name="currency_id" ref="BAM" />
@@ -814,7 +754,6 @@
             <field name="symbol">P</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBWP" model="res.currency.rate">
             <field name="currency_id" ref="BWP" />
@@ -827,7 +766,6 @@
             <field name="symbol">FBu</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBIF" model="res.currency.rate">
             <field name="currency_id" ref="BIF" />
@@ -840,7 +778,6 @@
             <field name="symbol">៛</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateKHR" model="res.currency.rate">
             <field name="currency_id" ref="KHR" />
@@ -853,7 +790,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateKYD" model="res.currency.rate">
             <field name="currency_id" ref="KYD" />
@@ -866,7 +802,6 @@
             <field name="symbol">CF</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateKMF" model="res.currency.rate">
             <field name="currency_id" ref="KMF" />
@@ -879,7 +814,6 @@
             <field name="symbol">Fr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCDF" model="res.currency.rate">
             <field name="currency_id" ref="CDF" />
@@ -892,7 +826,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCUP" model="res.currency.rate">
             <field name="currency_id" ref="CUP" />
@@ -905,7 +838,6 @@
             <field name="symbol">ƒ</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateANG" model="res.currency.rate">
             <field name="currency_id" ref="ANG" />
@@ -918,7 +850,6 @@
             <field name="symbol">£</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCYP" model="res.currency.rate">
             <field name="currency_id" ref="CYP" />
@@ -931,7 +862,6 @@
             <field name="symbol">Fdj</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateDJF" model="res.currency.rate">
             <field name="currency_id" ref="DJF" />
@@ -944,7 +874,6 @@
             <field name="symbol">RD$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateDOP" model="res.currency.rate">
             <field name="currency_id" ref="DOP" />
@@ -957,7 +886,6 @@
             <field name="name">TPE</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateTPE" model="res.currency.rate">
             <field name="currency_id" ref="TPE" />
@@ -970,7 +898,6 @@
             <field name="symbol">S/.</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateECS" model="res.currency.rate">
             <field name="currency_id" ref="ECS" />
@@ -983,7 +910,6 @@
             <field name="symbol">E£</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateEGP" model="res.currency.rate">
             <field name="currency_id" ref="EGP" />
@@ -996,7 +922,6 @@
             <field name="symbol">¢</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSVC" model="res.currency.rate">
             <field name="currency_id" ref="SVC" />
@@ -1009,7 +934,6 @@
             <field name="symbol">Nfk</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateERN" model="res.currency.rate">
             <field name="currency_id" ref="ERN" />
@@ -1022,7 +946,6 @@
             <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateEEK" model="res.currency.rate">
             <field name="currency_id" ref="EEK" />
@@ -1035,7 +958,6 @@
             <field name="symbol">Br</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateEEB" model="res.currency.rate">
             <field name="currency_id" ref="ETB" />
@@ -1048,7 +970,6 @@
             <field name="symbol">£</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateFKP" model="res.currency.rate">
             <field name="currency_id" ref="FKP" />
@@ -1061,7 +982,6 @@
             <field name="symbol">FJ$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateFJD" model="res.currency.rate">
             <field name="currency_id" ref="FJD" />
@@ -1074,7 +994,6 @@
             <field name="symbol">ლ</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateGEL" model="res.currency.rate">
             <field name="currency_id" ref="GEL" />
@@ -1087,7 +1006,6 @@
             <field name="symbol">£</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateGIP" model="res.currency.rate">
             <field name="currency_id" ref="GIP" />
@@ -1100,7 +1018,6 @@
             <field name="symbol">Q</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateQTQ" model="res.currency.rate">
             <field name="currency_id" ref="QTQ" />
@@ -1113,7 +1030,6 @@
             <field name="symbol">FG</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateGNF" model="res.currency.rate">
             <field name="currency_id" ref="GNF" />
@@ -1125,7 +1041,6 @@
             <field name="name">GWP</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateGWP" model="res.currency.rate">
             <field name="currency_id" ref="GWP" />
@@ -1138,7 +1053,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateGYD" model="res.currency.rate">
             <field name="currency_id" ref="GYD" />
@@ -1151,7 +1065,6 @@
             <field name="symbol">G</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateHTG" model="res.currency.rate">
             <field name="currency_id" ref="HTG" />
@@ -1164,7 +1077,6 @@
             <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateISK" model="res.currency.rate">
             <field name="currency_id" ref="ISK" />
@@ -1177,7 +1089,6 @@
             <field name="symbol">﷼</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateIRR" model="res.currency.rate">
             <field name="currency_id" ref="IRR" />
@@ -1190,7 +1101,6 @@
             <field name="symbol"> ع.د</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateIQD" model="res.currency.rate">
             <field name="currency_id" ref="IQD" />
@@ -1203,7 +1113,6 @@
             <field name="symbol">₪</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateILS" model="res.currency.rate">
             <field name="currency_id" ref="ILS" />
@@ -1216,7 +1125,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateJMD" model="res.currency.rate">
             <field name="currency_id" ref="JMD" />
@@ -1229,7 +1137,6 @@
             <field name="symbol"> د.ا </field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateJOD" model="res.currency.rate">
             <field name="currency_id" ref="JOD" />
@@ -1242,7 +1149,6 @@
             <field name="symbol">лв</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateKZT" model="res.currency.rate">
             <field name="currency_id" ref="KZT" />
@@ -1255,7 +1161,6 @@
             <field name="symbol">KSh</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateKES" model="res.currency.rate">
             <field name="currency_id" ref="KES" />
@@ -1268,7 +1173,6 @@
             <field name="symbol"> د.ك </field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateKWD" model="res.currency.rate">
             <field name="currency_id" ref="KWD" />
@@ -1281,7 +1185,6 @@
             <field name="symbol">лв</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateKGS" model="res.currency.rate">
             <field name="currency_id" ref="KGS" />
@@ -1294,7 +1197,6 @@
             <field name="symbol">₭</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateLAK" model="res.currency.rate">
             <field name="currency_id" ref="LAK" />
@@ -1307,7 +1209,6 @@
             <field name="symbol">ل.ل</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateLBP" model="res.currency.rate">
             <field name="currency_id" ref="LBP" />
@@ -1320,7 +1221,6 @@
             <field name="symbol">L</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateLSL" model="res.currency.rate">
             <field name="currency_id" ref="LSL" />
@@ -1333,7 +1233,6 @@
             <field name="symbol">L$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateLRD" model="res.currency.rate">
             <field name="currency_id" ref="LRD" />
@@ -1346,7 +1245,6 @@
             <field name="symbol"> ل.د </field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateLYD" model="res.currency.rate">
             <field name="currency_id" ref="LYD" />
@@ -1359,7 +1257,6 @@
             <field name="symbol">MOP$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMOP" model="res.currency.rate">
             <field name="currency_id" ref="MOP" />
@@ -1372,7 +1269,6 @@
             <field name="symbol">ден</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMKD" model="res.currency.rate">
             <field name="currency_id" ref="MKD" />
@@ -1385,7 +1281,6 @@
             <field name="symbol">Ar</field>            
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMGA" model="res.currency.rate">
             <field name="currency_id" ref="MGA" />
@@ -1398,7 +1293,6 @@
             <field name="symbol">MK</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMWK" model="res.currency.rate">
             <field name="currency_id" ref="MWK" />
@@ -1411,7 +1305,6 @@
             <field name="symbol">.ރ</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMVR" model="res.currency.rate">
             <field name="currency_id" ref="MVR" />
@@ -1424,7 +1317,6 @@
             <field name="symbol">UM</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMRO" model="res.currency.rate">
             <field name="currency_id" ref="MRO" />
@@ -1437,7 +1329,6 @@
             <field name="symbol">L</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMDL" model="res.currency.rate">
             <field name="currency_id" ref="MDL" />
@@ -1450,7 +1341,6 @@
             <field name="symbol">₮</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMNT" model="res.currency.rate">
             <field name="currency_id" ref="MNT" />
@@ -1463,7 +1353,6 @@
             <field name="symbol"> د.م. </field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMAD" model="res.currency.rate">
             <field name="currency_id" ref="MAD" />
@@ -1476,7 +1365,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBND" model="res.currency.rate">
             <field name="currency_id" ref="BND" />
@@ -1489,7 +1377,6 @@
             <field name="symbol">DZ</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateDZD" model="res.currency.rate">
             <field name="currency_id" ref="DZD" />
@@ -1502,7 +1389,6 @@
             <field name="symbol">GH¢</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateGHS" model="res.currency.rate">
             <field name="currency_id" ref="GHS" />
@@ -1515,7 +1401,6 @@
             <field name="symbol">D</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateGMD" model="res.currency.rate">
             <field name="currency_id" ref="GMD" />
@@ -1528,7 +1413,6 @@
             <field name="symbol">Ƶ</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateZRZ" model="res.currency.rate">
             <field name="currency_id" ref="ZRZ" />
@@ -1541,7 +1425,6 @@
             <field name="symbol">MT</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMZN" model="res.currency.rate">
             <field name="currency_id" ref="MZN" />
@@ -1554,7 +1437,6 @@
             <field name="symbol">K</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateMMK" model="res.currency.rate">
             <field name="currency_id" ref="MMK" />
@@ -1567,7 +1449,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateNAD" model="res.currency.rate">
             <field name="currency_id" ref="NAD" />
@@ -1580,7 +1461,6 @@
             <field name="symbol">₨</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateNPR" model="res.currency.rate">
             <field name="currency_id" ref="NPR" />
@@ -1593,7 +1473,6 @@
             <field name="symbol">L</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateALL" model="res.currency.rate">
             <field name="currency_id" ref="ALL" />
@@ -1606,7 +1485,6 @@
             <field name="symbol">C$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateNIO" model="res.currency.rate">
             <field name="currency_id" ref="NIO" />
@@ -1619,7 +1497,6 @@
             <field name="symbol">₦</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateNGN" model="res.currency.rate">
             <field name="currency_id" ref="NGN" />
@@ -1632,7 +1509,6 @@
             <field name="symbol">₩</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateKPW" model="res.currency.rate">
             <field name="currency_id" ref="KPW" />
@@ -1645,7 +1521,6 @@
             <field name="symbol">Z$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateZWD" model="res.currency.rate">
             <field name="currency_id" ref="ZWD" />
@@ -1658,7 +1533,6 @@
             <field name="symbol">ZK</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateZMK" model="res.currency.rate">
             <field name="currency_id" ref="ZMK" />
@@ -1671,7 +1545,6 @@
             <field name="symbol">﷼</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateYER" model="res.currency.rate">
             <field name="currency_id" ref="YER" />
@@ -1684,7 +1557,6 @@
             <field name="symbol">Bs</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateVUB" model="res.currency.rate">
             <field name="currency_id" ref="VUB" />
@@ -1697,7 +1569,6 @@
             <field name="symbol">€</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateEUR" model="res.currency.rate">
             <field name="currency_id" ref="EUR" />
@@ -1710,7 +1581,6 @@
             <field name="symbol">VT</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateVUV" model="res.currency.rate">
             <field name="currency_id" ref="VUV" />
@@ -1723,7 +1593,6 @@
             <field name="symbol">лв</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateUZS" model="res.currency.rate">
             <field name="currency_id" ref="UZS" />
@@ -1736,7 +1605,6 @@
             <field name="symbol">$U</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateUYP" model="res.currency.rate">
             <field name="currency_id" ref="UYP" />
@@ -1749,7 +1617,6 @@
             <field name="symbol">د.إ</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateAED" model="res.currency.rate">
             <field name="currency_id" ref="AED" />
@@ -1762,7 +1629,6 @@
             <field name="symbol">₴</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateUAG" model="res.currency.rate">
             <field name="currency_id" ref="UAG" />
@@ -1775,7 +1641,6 @@
             <field name="symbol">m</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateTMM" model="res.currency.rate">
             <field name="currency_id" ref="TMM" />
@@ -1788,7 +1653,6 @@
             <field name="symbol">TL</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateTRL" model="res.currency.rate">
             <field name="currency_id" ref="TRL" />
@@ -1801,7 +1665,6 @@
             <field name="symbol">DT</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateTND" model="res.currency.rate">
             <field name="currency_id" ref="TND" />
@@ -1814,7 +1677,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateTTD" model="res.currency.rate">
             <field name="currency_id" ref="TTD" />
@@ -1827,7 +1689,6 @@
             <field name="symbol">T$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateTOP" model="res.currency.rate">
             <field name="currency_id" ref="TOP" />
@@ -1840,7 +1701,6 @@
             <field name="symbol">฿</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateTHB" model="res.currency.rate">
             <field name="currency_id" ref="THB" />
@@ -1853,7 +1713,6 @@
             <field name="symbol">x/y</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateTZS" model="res.currency.rate">
             <field name="currency_id" ref="TZS" />
@@ -1865,7 +1724,6 @@
             <field name="name">TJR</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateTJR" model="res.currency.rate">
             <field name="currency_id" ref="TJR" />
@@ -1878,7 +1736,6 @@
             <field name="symbol">NT$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateTWD" model="res.currency.rate">
             <field name="currency_id" ref="TWD" />
@@ -1891,7 +1748,6 @@
             <field name="symbol">£</field>            
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSYP" model="res.currency.rate">
             <field name="currency_id" ref="SYP" />
@@ -1904,7 +1760,6 @@
             <field name="symbol">E</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSZL" model="res.currency.rate">
             <field name="currency_id" ref="SZL" />
@@ -1917,7 +1772,6 @@
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSRG" model="res.currency.rate">
             <field name="currency_id" ref="SRG" />
@@ -1930,7 +1784,6 @@
             <field name="symbol">£Sd</field>            
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSDD" model="res.currency.rate">
             <field name="currency_id" ref="SDD" />
@@ -1943,7 +1796,6 @@
             <field name="symbol">Rs</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateLKR" model="res.currency.rate">
             <field name="currency_id" ref="LKR" />
@@ -1956,7 +1808,6 @@
             <field name="symbol">£</field>            
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSSP" model="res.currency.rate">
             <field name="currency_id" ref="SSP" />
@@ -1970,7 +1821,6 @@
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="position">before</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateGBP" model="res.currency.rate">
             <field name="currency_id" ref="GBP" />
@@ -1983,7 +1833,6 @@
             <field name="symbol">Sh.</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSOD" model="res.currency.rate">
             <field name="currency_id" ref="SOD" />
@@ -1996,7 +1845,6 @@
             <field name="symbol">SI$</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSBD" model="res.currency.rate">
             <field name="currency_id" ref="SBD" />
@@ -2009,7 +1857,6 @@
             <field name="symbol">Le</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSLL" model="res.currency.rate">
             <field name="currency_id" ref="SLL" />
@@ -2022,7 +1869,6 @@
             <field name="symbol">SR</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSCR" model="res.currency.rate">
             <field name="currency_id" ref="SCR" />
@@ -2035,7 +1881,6 @@
             <field name="symbol">din.</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateRSD" model="res.currency.rate">
             <field name="currency_id" ref="RSD" />
@@ -2048,7 +1893,6 @@
             <field name="symbol">SR</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSAR" model="res.currency.rate">
             <field name="currency_id" ref="SAR" />
@@ -2061,7 +1905,6 @@
             <field name="symbol">Db</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSTD" model="res.currency.rate">
             <field name="currency_id" ref="STD" />
@@ -2074,7 +1917,6 @@
             <field name="symbol">₤</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateITL" model="res.currency.rate">
             <field name="currency_id" ref="ITL" />
@@ -2087,7 +1929,6 @@
             <field name="symbol">WS$</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateWST" model="res.currency.rate">
             <field name="currency_id" ref="WST" />
@@ -2100,7 +1941,6 @@
             <field name="symbol">£</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSHP" model="res.currency.rate">
             <field name="currency_id" ref="SHP" />
@@ -2113,7 +1953,6 @@
             <field name="symbol">RF</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateRWF" model="res.currency.rate">
             <field name="currency_id" ref="RWF" />
@@ -2126,7 +1965,6 @@
             <field name="symbol">R</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateRUR" model="res.currency.rate">
             <field name="currency_id" ref="RUR" />
@@ -2139,7 +1977,6 @@
             <field name="symbol">L</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateROL" model="res.currency.rate">
             <field name="currency_id" ref="ROL" />
@@ -2152,7 +1989,6 @@
             <field name="symbol">QR</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateQAR" model="res.currency.rate">
             <field name="currency_id" ref="QAR" />
@@ -2165,7 +2001,6 @@
             <field name="symbol">zł</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="ratePLZ" model="res.currency.rate">
             <field name="currency_id" ref="PLZ" />
@@ -2178,7 +2013,6 @@
             <field name="symbol">S/.</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="ratePEN" model="res.currency.rate">
             <field name="currency_id" ref="PEN" />
@@ -2191,7 +2025,6 @@
             <field name="symbol">₲</field>			            
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="ratePYG" model="res.currency.rate">
             <field name="currency_id" ref="PYG" />
@@ -2204,7 +2037,6 @@
             <field name="symbol">K</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="ratePGK" model="res.currency.rate">
             <field name="currency_id" ref="PGK" />
@@ -2217,7 +2049,6 @@
             <field name="symbol">Rs.</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="ratePKR" model="res.currency.rate">
             <field name="currency_id" ref="PKR" />
@@ -2230,7 +2061,6 @@
             <field name="symbol">ر.ع.</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateOMR" model="res.currency.rate">
             <field name="currency_id" ref="OMR" />
@@ -2243,7 +2073,6 @@
             <field name="symbol">$</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCVE" model="res.currency.rate">
             <field name="currency_id" ref="CVE" />
@@ -2256,7 +2085,6 @@
             <field name="symbol">Sk</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSKK" model="res.currency.rate">
             <field name="currency_id" ref="SKK" />
@@ -2268,7 +2096,6 @@
             <field name="name">SIT</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateSIT" model="res.currency.rate">
             <field name="currency_id" ref="SIT" />
@@ -2281,7 +2108,6 @@
             <field name="symbol">дин.</field>			
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateYUM" model="res.currency.rate">
             <field name="currency_id" ref="YUM" />
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index cdde048b78b..f4dc8d4a714 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-03-29 04:45+0000\n"
-"Last-Translator: Josh Kim <joshkkim@gmail.com>\n"
+"PO-Revision-Date: 2013-05-18 23:13+0000\n"
+"Last-Translator: AhnJD <zion64@zeiv.dsmynas.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-30 06:08+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-19 06:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -129,6 +129,16 @@ msgid ""
 "    * Product Attributes\n"
 "    "
 msgstr ""
+"\n"
+"제품양식에 특성과 제조회사를 추가하는 모듈\n"
+"====================================================================\n"
+"제품에 아래 내용을 정의할 수 있습니다.\n"
+"-----------------------------------------------\n"
+"    * 제조회사\n"
+"    * 제조회사 제품명칭\n"
+"    * 제조회사 제품코드\n"
+"    * 제품 특성\n"
+"    "
 
 #. module: base
 #: field:ir.actions.client,params:0
@@ -551,6 +561,14 @@ msgid ""
 "that have no counterpart in the general financial accounts.\n"
 "    "
 msgstr ""
+"\n"
+"관리회계 객체를 지정하기 위한 모듈\n"
+"===============================================\n"
+"\n"
+"OpenERP에서는 관리회계가 일반회계와 연계되지만 완전히\n"
+"독립적으로 취급됩니다. 따라서, 일반 재무회계에는 영향을 주지\n"
+"않으면서 다양하고 차별화된 분석 작업을 수행할 수 있습니다.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_idea
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 53c64f2527e..675e887f1c6 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-01 12:25+0000\n"
+"PO-Revision-Date: 2013-05-20 14:30+0000\n"
 "Last-Translator: Dušan Laznik (Mentis) <laznik@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-02 05:47+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-05-21 05:43+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -11374,9 +11374,12 @@ msgid ""
 "Thank you in advance for your cooperation.\n"
 "Best Regards,"
 msgstr ""
-"Spoštovani,\n"
+"Iz naših poslovnih knjig je razvidno,da imate zapadle obveznosti do našega "
+"podjetja.\n"
 "\n"
-"Naši podatki kažejo , da nam dolgujete spodaj navedeni znesek."
+"Prosimo, da svoj dolg takoj poravnate na naš račun.\n"
+"\n"
+"Če ste svoj dolg že poravnali, upoštevajte opomin za brezpredmeten."
 
 #. module: base
 #: view:ir.module.category:0
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 0247b63ce8e..ae049182a83 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-05-05 17:30+0000\n"
+"PO-Revision-Date: 2013-05-19 13:35+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-06 06:35+0000\n"
-"X-Generator: Launchpad (build 16598)\n"
+"X-Launchpad-Export-Date: 2013-05-20 06:31+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -2104,6 +2104,8 @@ msgid ""
 "Check this box if this contact is a supplier. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
 msgstr ""
+"Bu kişi bir tedarikçi ise bu kutuyu işaretleyin. Eğer işaretlenmemişse, "
+"satınalma elemanı sipariş kodlarken bunu göremezler."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_evaluation
diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py
index 44c9e57af32..0f505814c0c 100644
--- a/openerp/addons/base/ir/ir_sequence.py
+++ b/openerp/addons/base/ir/ir_sequence.py
@@ -54,6 +54,34 @@ class ir_sequence(openerp.osv.osv.osv):
     """
     _name = 'ir.sequence'
     _order = 'name'
+    
+    def _get_number_next_actual(self, cr, user, ids, field_name, arg, context=None):
+        '''Return number from ir_sequence row when no_gap implementation,
+        and number from postgres sequence when standard implementation.'''
+        res = dict.fromkeys(ids)
+        for element in self.browse(cr, user, ids, context=context):
+            if  element.implementation != 'standard':
+                res[element.id] = element.number_next
+            else:
+                # get number from postgres sequence. Cannot use
+                # currval, because that might give an error when
+                # not having used nextval before.
+                statement = (
+                    "SELECT last_value, increment_by, is_called"
+                    " FROM ir_sequence_%03d"
+                    % element.id)
+                cr.execute(statement)
+                (last_value, increment_by, is_called) = cr.fetchone()
+                if is_called:
+                    res[element.id] = last_value + increment_by
+                else:
+                    res[element.id] = last_value
+        return res
+
+    def _set_number_next_actual(self, cr, uid, id, name, value, args=None, context=None):
+        return self.write(cr, uid, id, {'number_next': value or 0}, context=context)
+
+
     _columns = {
         'name': openerp.osv.fields.char('Name', size=64, required=True),
         'code': openerp.osv.fields.selection(_code_get, 'Code', size=64),
@@ -67,6 +95,7 @@ class ir_sequence(openerp.osv.osv.osv):
         'prefix': openerp.osv.fields.char('Prefix', size=64, help="Prefix value of the record for the sequence"),
         'suffix': openerp.osv.fields.char('Suffix', size=64, help="Suffix value of the record for the sequence"),
         'number_next': openerp.osv.fields.integer('Next Number', required=True, help="Next number of this sequence"),
+        'number_next_actual': openerp.osv.fields.function(_get_number_next_actual, fnct_inv=_set_number_next_actual, type='integer', required=True, string='Next Number', help='Next number that will be used. This number can be incremented frequently so the displayed value might already be obsolete'),
         'number_increment': openerp.osv.fields.integer('Increment Number', required=True, help="The next number of the sequence will be incremented by this number"),
         'padding' : openerp.osv.fields.integer('Number Padding', required=True, help="OpenERP will automatically adds some '0' on the left of the 'Next Number' to get the required padding size."),
         'company_id': openerp.osv.fields.many2one('res.company', 'Company'),
@@ -77,6 +106,7 @@ class ir_sequence(openerp.osv.osv.osv):
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.sequence', context=c),
         'number_increment': 1,
         'number_next': 1,
+        'number_next_actual': 1,
         'padding' : 0,
     }
 
@@ -121,7 +151,7 @@ class ir_sequence(openerp.osv.osv.osv):
         # object depends on it.
         cr.execute("DROP SEQUENCE IF EXISTS %s RESTRICT " % names)
 
-    def _alter_sequence(self, cr, id, number_increment, number_next):
+    def _alter_sequence(self, cr, id, number_increment, number_next=None):
         """ Alter a PostreSQL sequence.
 
         There is no access rights check.
@@ -129,9 +159,15 @@ class ir_sequence(openerp.osv.osv.osv):
         if number_increment == 0:
              raise osv.except_osv(_('Warning!'),_("Increment number must not be zero."))
         assert isinstance(id, (int, long))
-        cr.execute("""
-            ALTER SEQUENCE ir_sequence_%03d INCREMENT BY %%s RESTART WITH %%s
-            """ % id, (number_increment, number_next))
+        seq_name = 'ir_sequence_%03d' % (id,)
+        cr.execute("SELECT relname FROM pg_class WHERE relkind = %s AND relname=%s", ('S', seq_name))
+        if not cr.fetchone():
+            # sequence is not created yet, we're inside create() so ignore it, will be set later
+            return
+        statement = "ALTER SEQUENCE %s INCREMENT BY %d" % (seq_name, number_increment)
+        if number_next is not None:
+            statement += " RESTART WITH %d" % (number_next, )
+        cr.execute(statement)
 
     def create(self, cr, uid, values, context=None):
         """ Create a sequence, in implementation == standard a fast gaps-allowed PostgreSQL sequence is used.
@@ -160,7 +196,13 @@ class ir_sequence(openerp.osv.osv.osv):
             n = values.get('number_next', row['number_next'])
             if row['implementation'] == 'standard':
                 if new_implementation in ('standard', None):
-                    self._alter_sequence(cr, row['id'], i, n)
+                    # Implementation has NOT changed.
+                    # Only change sequence if really requested.
+                    if row['number_next'] != n:
+                        self._alter_sequence(cr, row['id'], i, n)
+                    else:
+                        # Just in case only increment changed
+                        self._alter_sequence(cr, row['id'], i)
                 else:
                     self._drop_sequence(cr, row['id'])
             else:
@@ -200,7 +242,7 @@ class ir_sequence(openerp.osv.osv.osv):
         force_company = context.get('force_company')
         if not force_company:
             force_company = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-        sequences = self.read(cr, uid, seq_ids, ['company_id','implementation','number_next','prefix','suffix','padding'])
+        sequences = self.read(cr, uid, seq_ids, ['name','company_id','implementation','number_next','prefix','suffix','padding'])
         preferred_sequences = [s for s in sequences if s['company_id'] and s['company_id'][0] == force_company ]
         seq = preferred_sequences[0] if preferred_sequences else sequences[0]
         if seq['implementation'] == 'standard':
@@ -210,8 +252,11 @@ class ir_sequence(openerp.osv.osv.osv):
             cr.execute("SELECT number_next FROM ir_sequence WHERE id=%s FOR UPDATE NOWAIT", (seq['id'],))
             cr.execute("UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s ", (seq['id'],))
         d = self._interpolation_dict()
-        interpolated_prefix = self._interpolate(seq['prefix'], d)
-        interpolated_suffix = self._interpolate(seq['suffix'], d)
+        try:
+            interpolated_prefix = self._interpolate(seq['prefix'], d)
+            interpolated_suffix = self._interpolate(seq['suffix'], d)
+        except ValueError:
+            raise osv.except_osv(_('Warning'), _('Invalid prefix or suffix for sequence \'%s\'') % (seq.get('name')))
         return interpolated_prefix + '%%0%sd' % seq['padding'] % seq['number_next'] + interpolated_suffix
 
     def next_by_id(self, cr, uid, sequence_id, context=None):
diff --git a/openerp/addons/base/ir/ir_sequence_view.xml b/openerp/addons/base/ir/ir_sequence_view.xml
index 0fa46d61957..050eb9e2333 100644
--- a/openerp/addons/base/ir/ir_sequence_view.xml
+++ b/openerp/addons/base/ir/ir_sequence_view.xml
@@ -20,7 +20,7 @@
                             <field name="suffix"/>
                             <field name="padding"/>
                             <field name="number_increment"/>
-                            <field name="number_next"/>
+                            <field name="number_next_actual"/>
                             <field name="implementation"/>
                         </group>
                         <group col="3" string="Legend (for prefix, suffix)">
@@ -57,7 +57,7 @@
                     <field name="prefix"/>
                     <field name="padding"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="number_next"/>
+                    <field name="number_next_actual"/>
                     <field name="number_increment"/>
                     <field name="implementation"/>
                 </tree>
diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py
index 98dd6ed00d8..4756cdbe01a 100644
--- a/openerp/addons/base/res/res_currency.py
+++ b/openerp/addons/base/res/res_currency.py
@@ -73,6 +73,7 @@ class res_currency(osv.osv):
         'position' : 'after',
         'rounding': 0.01,
         'accuracy': 4,
+        'company_id': False,
     }
     _sql_constraints = [
         # this constraint does not cover all cases due to SQL NULL handling for company_id,
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index fb4387fb3ae..5d4c10eb242 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -74,7 +74,8 @@ class format_address(object):
 
 
 def _tz_get(self,cr,uid, context=None):
-    return [(x, x) for x in pytz.all_timezones]
+    # put POSIX 'Etc/*' entries at the end to avoid confusing users - see bug 1086728
+    return [(tz,tz) for tz in sorted(pytz.all_timezones, key=lambda tz: tz if not tz.startswith('Etc/') else '_')]
 
 class res_partner_category(osv.osv):
 
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index b0de06078af..8895268814f 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -87,6 +87,12 @@
             <field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
 	</record>
 
+        <record id="res_currency_rule" model="ir.rule">
+            <field name="name">multi-company currency rule</field>
+            <field model="ir.model" name="model_id" ref="model_res_currency"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
+
     </data>
 </openerp>
 
diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml
index f1610e8b3a4..1516f090e94 100644
--- a/openerp/addons/base/test/test_osv_expression.yml
+++ b/openerp/addons/base/test/test_osv_expression.yml
@@ -291,22 +291,22 @@
         assert res_101 == [], 'res_101: expected %r, got %r' % ([], res_101)
         assert res_102 == company_ids, 'res_102: expected %r, got %r' % (company_ids, res_102)
 -
-    Property of the query (one2many != False).
+    Verify domain evaluation for `one2many != False`
 -
-    !python {model: res.currency }: |
-        ids = self.search(cr, uid, [])
-        referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)])
-        companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '!=', False)]))
-        assert referenced_companies == companies
+    !python {model: res.partner.category }: |
+        all_ids = self.search(cr, uid, [])
+        parent_categs = set([c.parent_id.id for c in self.browse(cr, uid, all_ids) if c.parent_id])
+        result = set(self.search(cr, uid, [('child_ids', '!=', False)]))
+        assert result and result == parent_categs, "Got %r, expected %r" % (result, parent_categs) 
 -
-    Property of the query (one2many = False).
+    Verify domain evaluation for `one2many == False`
 -
-    !python {model: res.currency }: |
-        ids = self.search(cr, uid, [])
-        referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)])
-        unreferenced_companies = set(self.pool.get('res.company').search(cr, uid, [])).difference(referenced_companies)
-        companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '=', False)]))
-        assert unreferenced_companies == companies
+    !python {model: res.partner.category }: |
+        all_ids = self.search(cr, uid, [])
+        parent_categs = set([c.parent_id.id for c in self.browse(cr, uid, all_ids) if c.parent_id])
+        leaf_categs = set(all_ids) - parent_categs
+        result = set(self.search(cr, uid, [('child_ids', '=', False)]))
+        assert result and result == leaf_categs, "Got %r, expected %r" % (result, leaf_categs)
 -
     Equivalent queries.
 -
diff --git a/openerp/tests/test_mail.py b/openerp/tests/test_mail.py
old mode 100644
new mode 100755