Merge lp:~openerp-dev/openobject-server/trunk-bug-1094477-tpa into lp:openobject-server

[Turkesh Patel (openERP)]

[FIX] Change Default currency of Estonia to EUR from EEK as it have changed from 2011.

=== modified file 'openerp/addons/base/currency_data.xml'
--- openerp/addons/base/currency_data.xml	2013-01-11 11:40:12 +0000
+++ openerp/addons/base/currency_data.xml	2013-01-16 11:34:21 +0000
@@ -1017,19 +1017,6 @@
             <field name="rate">18.89</field>
         </record>
         
-        <record id="EEK" model="res.currency">
-            <field name="name">EEK</field>
-            <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" />
-            <field eval="time.strftime('%Y-01-01')" name="name"/>
-            <field name="rate">14.41</field>
-        </record>
-        
         <record id="ETB" model="res.currency">
             <field name="name">ETB</field>
             <field name="symbol">Br</field>

=== modified file 'openerp/addons/base/res/res_country_data.xml'
--- openerp/addons/base/res/res_country_data.xml	2012-12-17 13:02:49 +0000
+++ openerp/addons/base/res/res_country_data.xml	2013-01-16 11:34:21 +0000
@@ -330,7 +330,7 @@
         <record id="ee" model="res.country">
             <field name="name">Estonia</field>
             <field name="code">ee</field>
-            <field name="currency_id" ref="EEK"/>
+            <field name="currency_id" ref="EUR"/>
         </record>
         <record id="eg" model="res.country">
             <field name="name">Egypt</field>