diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2011-10-03 17:35:09 +0200 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2011-10-03 17:35:09 +0200 |
| commit | d9b6f5e2d0d0c30e4e55bc72454b6ec4b720232c (patch) | |
| tree | 14eb229c961e3413abd06b6ad1a86d64d2d3a2ab /openerp/addons/base/security/base_security.xml | |
| parent | fbb6e5e56aaf36ff652edbec0181a0fcb95a3601 (diff) | |
| parent | bf3d0d604c89edfd709603c8ca261d020e9ac748 (diff) | |
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-20111003153509-8mbfg1t8hm92pult
Diffstat (limited to 'openerp/addons/base/security/base_security.xml')
| -rw-r--r-- | openerp/addons/base/security/base_security.xml | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml index fe3a10fdaed..65696210687 100644 --- a/openerp/addons/base/security/base_security.xml +++ b/openerp/addons/base/security/base_security.xml @@ -42,28 +42,32 @@ <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/> </record> - <record model="ir.rule" id="res_widget_user_rule"> - <field name="name">res.widget.user rule</field> - <field name="model_id" ref="model_res_widget_user"/> - <field name="global" eval="True"/> - <field name="domain_force">['|', ('user_id','=',user.id),('user_id','=',False)]</field> - </record> + </data> - <record model="ir.rule" id="res_partner_rule"> - <field name="name">res.partner company</field> - <field name="model_id" ref="model_res_partner"/> - <field name="global" eval="True"/> - <!-- Show partners from ancestors and descendants companies (or company-less), this is usually a better - default for multicompany setups. --> - <field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field> - </record> + <data noupdate="1"> - <record model="ir.rule" id="multi_company_default_rule"> - <field name="name">Multi_company_default company</field> - <field name="model_id" ref="model_multi_company_default"/> - <field name="global" eval="True"/> - <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field> - </record> + <record model="ir.rule" id="res_widget_user_rule"> + <field name="name">res.widget.user rule</field> + <field name="model_id" ref="model_res_widget_user"/> + <field name="global" eval="True"/> + <field name="domain_force">['|', ('user_id','=',user.id),('user_id','=',False)]</field> + </record> + + <record model="ir.rule" id="res_partner_rule"> + <field name="name">res.partner company</field> + <field name="model_id" ref="model_res_partner"/> + <field name="global" eval="True"/> + <!-- Show partners from ancestors and descendants companies (or company-less), this is usually a better + default for multicompany setups. --> + <field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field> + </record> + + <record model="ir.rule" id="multi_company_default_rule"> + <field name="name">Multi_company_default company</field> + <field name="model_id" ref="model_multi_company_default"/> + <field name="global" eval="True"/> + <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field> + </record> <record model="ir.rule" id="ir_values_default_rule"> <field name="name">Defaults: alter personal values only</field> |