odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] complete the res.users objects to respect the new constraint on company_id 

bzr revid: chs@openerp.com-20100507160535-yjs1g45d36w3m59p
This commit is contained in:
Christophe Simonis 2010-05-07 18:05:35 +02:00
parent 7e10243777
commit f692c09978
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/multi_company/multi_company_demo.xml
View File

@ -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>

2
addons/point_of_sale/posrule_data.xml
View File

@ -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>