From f692c09978d330323e9b3556302b01b072b04ca7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 7 May 2010 18:05:35 +0200
Subject: [PATCH] [FIX] complete the res.users objects to respect the new
 constraint on company_id

bzr revid: chs@openerp.com-20100507160535-yjs1g45d36w3m59p
---
 addons/multi_company/multi_company_demo.xml | 5 +++++
 addons/point_of_sale/posrule_data.xml       | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 592e63d5ed26..a56b596f7e19 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -64,6 +64,7 @@
             <field name="name">OpenERP Editor</field>
             <field name="login">editor_demo</field>
             <field name="company_id" ref="res_company_oerp_editor"/>
+            <field name="company_ids" eval="[(4, ref('res_company_oerp_editor'))]"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
         </record>
         <record id="res_users_sales_demo_us" model="res.users">
@@ -71,6 +72,7 @@
             <field name="name">OpenERP Salesman US</field>
             <field name="login">sales_demo_us</field>
             <field name="company_id" ref="res_company_oerp_us"/>
+            <field name="company_ids" eval="[(4, ref('res_company_oerp_us'))]"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
         </record>
         <record id="res_users_sales_demo_be" model="res.users">
@@ -78,6 +80,7 @@
             <field name="name">OpenERP Salesman BE</field>
             <field name="login">sales_demo_be</field>
             <field name="company_id" ref="res_company_oerp_be"/>
+            <field name="company_ids" eval="[(4, ref('res_company_oerp_be'))]"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
         </record>
         <record id="res_users_sales_demo_in" model="res.users">
@@ -85,6 +88,7 @@
             <field name="name">OpenERP Salesman IN</field>
             <field name="login">sales_demo_in</field>
             <field name="company_id" ref="res_company_oerp_in"/>
+            <field name="company_ids" eval="[(4, ref('res_company_oerp_in'))]"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
         </record>
         <record id="res_users_odoo_demo" model="res.users">
@@ -92,6 +96,7 @@
             <field name="name">Odoo</field>
             <field name="login">odoo_demo</field>
             <field name="company_id" ref="res_company_odoo"/>
+            <field name="company_ids" eval="[(4, ref('res_company_odoo'))]"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
         </record>
 
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 05313a72d51f..1c58c50b43e8 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -67,6 +67,7 @@
             <field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
             <field eval="&quot;&quot;&quot;Shop 1 User&quot;&quot;&quot;" name="name"/>
             <field name="company_id" ref="stock.res_company_shop0"/>
+            <field name="company_ids" eval="[(4, ref('stock.res_company_shop0'))]"/>
             <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="login"/>
             <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
         </record>
@@ -77,6 +78,7 @@
             <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="password"/>
             <field eval="&quot;&quot;&quot;Shop 2 User&quot;&quot;&quot;" name="name"/>
             <field name="company_id" ref="stock.res_company_tinyshop0"/>
+            <field name="company_ids" eval="[(4, ref('stock.res_company_tinyshop0'))]"/>
             <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
             <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
         </record>
-- 
GitLab