Merge lp:~therp-nl/openobject-server/7.0-lp1111298-remove_additional_company_assignments into lp:openobject-server/7.0

[Stefan Rijnhart (Opener)]

[Olivier Dony (Odoo) (odo-openerp)]

Hi Stefan,

Thanks for catching this missing part of the original fix! It's my fault for not reviewing it more carefully.

Your fix looks good, however it breaks the ORM test suite related to one2many fields. This happens because those tests are using "res.company.currency_ids" as an example o2m field, and are strongly coupled with res.currency default data :-(

You can see the result of the test failure on the runbot log (search for "list index out of range"):
   http://runbot.openerp.com/openerp-dev-7-0-bug-1111298-therp-11987/logs/test-all.txt

If you have some more time to spend on this, you should be able to fix it by setting a company on the res.currency records just before the relevant tests. That change will be rolled back at the end of the tests. Alternatively you can create extra test data or change the tests to use a different o2m field from any of the `base` models.
(Otherwise I'll try to fix it while merging)

Many thanks!

PS: you can have your merge proposals automatically tested by runbot if you subscribe the ~therp-nl team in runbot (the link to do so is in the partners portal).

review: Needs Fixing

[Olivier Dony (Odoo) (odo-openerp)]

I ended up fixing the tests while merging, thanks!

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks, sorry I did not get round to fixing the tests myself.

[Olivier Dony (Odoo) (odo-openerp)]

Don't be sorry, it's great that you provided the patch in first place :-)
I tried not to make the ownership of the patch lines confusing, by explicitly making an extra commit in a temporary branch before merging the whole thing at once.

=== modified file 'openerp/addons/base/base_data.xml'
--- openerp/addons/base/base_data.xml	2012-12-21 19:56:14 +0000
+++ openerp/addons/base/base_data.xml	2013-05-29 10:36:31 +0000
@@ -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 @@
             <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>

=== modified file 'openerp/addons/base/currency_data.xml'
--- openerp/addons/base/currency_data.xml	2013-05-17 08:03:19 +0000
+++ openerp/addons/base/currency_data.xml	2013-05-29 10:36:31 +0000
@@ -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>