diff options
| author | Numerigraphe - Lionel Sausin <ls@numerigraphe.fr> | 2010-11-12 15:10:41 +0100 |
|---|---|---|
| committer | Numerigraphe - Lionel Sausin <ls@numerigraphe.fr> | 2010-11-12 15:10:41 +0100 |
| commit | 182cf2b196da0d1f55ddfdcff62058b423e1bbc0 (patch) | |
| tree | 779b50e2e54b1624ba669b4a3f56bb6407c08d49 /bin/addons/base/security/base_security.xml | |
| parent | e013734045bbaae906748a8026455bac6786568e (diff) | |
| parent | cc0d270bab0d0b7862430c3e527f7edc02d1d587 (diff) | |
[MERGE] sync with the trunk
bzr revid: ls@numerigraphe.fr-20101112141041-19kpvr7pzxqankqo
Diffstat (limited to 'bin/addons/base/security/base_security.xml')
| -rw-r--r-- | bin/addons/base/security/base_security.xml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml index 0af5f181e31..ed36267031e 100644 --- a/bin/addons/base/security/base_security.xml +++ b/bin/addons/base/security/base_security.xml @@ -14,7 +14,7 @@ </record> <record model="res.groups" id="group_user"> - <field name="name">Employee</field> + <field name="name">Internal User</field> </record> <record model="res.groups" context="{'noadmin':True}" id="group_multi_company"> @@ -29,23 +29,29 @@ <field name="name">Useability / No One</field> </record> + <record id="group_sale_manager" model="res.groups"> + <field name="name">Sales / Manager</field> + </record> + <record id="group_sale_salesman" model="res.groups"> + <field name="name">Sales / User</field> + </record> <!-- Set accesses to menu --> <record model="ir.ui.menu" id="base.menu_administration"> <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/> </record> - <record model="ir.rule" id="res_partner_address_rule"> - <field name="name">res.partner.address company</field> - <field name="model_id" ref="model_res_partner_address"/> + <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">[('company_id','child_of',[user.company_id.id])]</field> + <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"/> - <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|', ('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field> </record> <record model="ir.rule" id="multi_company_default_rule"> |