From 1d431fe4f89a2cf9c195eb84c579771158a1c10d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 28 Aug 2013 10:50:19 +0200
Subject: [PATCH] [FIX] stock,mrp: move multicomp user to test instead of demo
 data

bzr revid: mat@openerp.com-20130828085019-cgbj6zrug73it3nw
---
 addons/mrp/tests/test_multicompany.py   |  8 +++++++-
 addons/stock/stock_demo.xml             | 10 ----------
 addons/stock/tests/test_multicompany.py |  8 +++++++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/mrp/tests/test_multicompany.py b/addons/mrp/tests/test_multicompany.py
index 78986bd41b2..f38a31a70de 100644
--- a/addons/mrp/tests/test_multicompany.py
+++ b/addons/mrp/tests/test_multicompany.py
@@ -33,7 +33,13 @@ class TestMrpMulticompany(common.TransactionCase):
         self.res_users = self.registry('res.users')
         self.stock_location = self.registry('stock.location')
 
-        model, self.multicompany_user_id = self.ir_model_data.get_object_reference(cr, uid, 'stock', 'multicompany_user')
+        model, group_user_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+        model, group_stock_manager_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'group_stock_manager')
+        model, company_2_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'res_company_2')
+        self.multicompany_user_id = self.res_users.create(cr, uid,
+            {'name': 'multicomp', 'login': 'multicomp',
+             'groups_id': [(6, 0, [group_user_id, group_stock_manager_id])],
+             'company_id': company_2_id, 'company_ids': [(6,0,[company_2_id])]})
 
 
     def test_00_multicompany_user(self):
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 94844ee8904..eb5a6c46380 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -287,16 +287,6 @@
              <field name="company_id" ref="base.main_company"/>
         </record>
 
-        <record id="multicompany_user" model="res.users">
-          <field name="name">multicomp</field>
-          <field name="login">multicomp</field>
-          <field name="password">multicomp</field>
-          <field name="company_id" ref="res_company_2"/>
-          <field name="company_ids" eval="[(6,0,[ref('res_company_2')])]"/>
-          <field name="groups_id" eval="[(6,0,[ref('base.group_user'), ref('stock.group_stock_manager')])]"/>
-
-        </record>
-
     </data>
 </openerp>
 
diff --git a/addons/stock/tests/test_multicompany.py b/addons/stock/tests/test_multicompany.py
index d30e7d0ef2b..fb840a846ea 100644
--- a/addons/stock/tests/test_multicompany.py
+++ b/addons/stock/tests/test_multicompany.py
@@ -36,7 +36,13 @@ class TestStockMulticompany(common.TransactionCase):
         self.stock_fill_inventory = self.registry('stock.fill.inventory')
         self.stock_warehouse = self.registry('stock.warehouse')
 
-        model, self.multicompany_user_id = self.ir_model_data.get_object_reference(cr, uid, 'stock', 'multicompany_user')
+        model, group_user_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+        model, group_stock_manager_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'group_stock_manager')
+        model, company_2_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'res_company_2')
+        self.multicompany_user_id = self.res_users.create(cr, uid,
+            {'name': 'multicomp', 'login': 'multicomp',
+             'groups_id': [(6, 0, [group_user_id, group_stock_manager_id])],
+             'company_id': company_2_id, 'company_ids': [(6,0,[company_2_id])]})
 
     def test_00_multicompany_default_stock_move(self):
         """check no error on getting default stock.move values in multicompany setting"""