From 6c2a6d2bc3983626477fdd433785cc8b7d5fa8ad Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Wed, 29 May 2013 12:35:03 +0200
Subject: [PATCH 1/2] [FIX] Remove additional company assignments to currencies

lp bug: https://launchpad.net/bugs/1111298 fixed

bzr revid: stefan@therp.nl-20130529103503-bhhs25yxlo92xnig
---
 openerp/addons/base/base_data.xml     | 6 ------
 openerp/addons/base/currency_data.xml | 1 -
 2 files changed, 7 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 2922dd82dc4..6a47325db39 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -49,8 +49,6 @@
             <field name="symbol">€</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
-            <!-- Company ID will be set later -->
-            <field name="company_id" eval="None"/>
         </record>
         <record id="rateEUR" model="res.currency.rate">
             <field name="rate">1.0</field>
@@ -86,10 +84,6 @@ Administrator</field>
             <field name="company_id" ref="main_company"/>
         </record>
 
-        <record id="EUR" model="res.currency">
-            <field name="company_id" ref="main_company"/>
-        </record>
-
         <record id="ir_mail_server_localhost0" model="ir.mail_server">
             <field name="name">localhost</field>
             <field name="smtp_host">localhost</field>
diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
index 96ff81cc0d1..e38f777d584 100644
--- a/openerp/addons/base/currency_data.xml
+++ b/openerp/addons/base/currency_data.xml
@@ -466,7 +466,6 @@
            <field name="rounding">0.01</field>
            <field name="accuracy">4</field>
            <field name="symbol">¢</field>
-           <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCRC" model="res.currency.rate">
            <field name="rate">691.3153</field>

From 15090112294f86ad6b887d77b06ee37816461a07 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 6 Jun 2013 11:04:10 +0200
Subject: [PATCH 2/2] [FIX] base: fix o2m testsuite following change of default
 currency data, in relation with bug 1111298

lp bug: https://launchpad.net/bugs/1111298 fixed

bzr revid: odo@openerp.com-20130606090410-4t6o6se18ejbgqmj
---
 openerp/addons/base/test/test_osv_expression.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml
index 1516f090e94..111ce40f2ce 100644
--- a/openerp/addons/base/test/test_osv_expression.yml
+++ b/openerp/addons/base/test/test_osv_expression.yml
@@ -375,6 +375,11 @@
         currency_ids3 = self.pool.get('res.currency').search(cr, uid, [('id', 'not in', [])])
         assert currency_ids1 == currency_ids2 == currency_ids3, 'All 3 results should have be the same: all currencies'
         default_company = self.browse(cr, uid, 1)
+
+        # Due to currency data definition change (in relation with bug 1111298), this test now needs
+        # a manual setup where all currencies are assigned to the default company.
+        self.pool['res.currency'].write(cr, uid, currency_ids1, {'company_id': default_company.id})
+
         # one2many towards same model
         res_1 = self.search(cr, uid, [('child_ids', 'in', [x.id for x in company.child_ids])]) # any company having a child of company3 as child
         res_2 = self.search(cr, uid, [('child_ids', 'in', [company.child_ids[0].id])]) # any company having the first child of company3 as child