diff options
| author | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
|---|---|---|
| committer | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
| commit | d979aad3de95ae24aa1db52cf17c4eecf3d3ce6b (patch) | |
| tree | 592698c8e0dab53fcd157dd456a800bd4a80b5bf /addons/hr/security | |
| parent | eea80125f7d1c739260929fb1f38866ef21439e1 (diff) | |
| parent | d101d3fbaaffe2d0219ac6cfeef50338a2501664 (diff) | |
[MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4
Diffstat (limited to 'addons/hr/security')
| -rw-r--r-- | addons/hr/security/hr_security.xml | 13 | ||||
| -rw-r--r-- | addons/hr/security/ir.model.access.csv | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index cf7dbd19f80..8e77830184b 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -2,21 +2,20 @@ <openerp> <data noupdate="1"> - <record id="base.group_hr_manager" model="res.groups"> - <field name="name">Human Resources / Manager</field> - </record> - <record id="base.group_hr_user" model="res.groups"> - <field name="name">Human Resources / Officer</field> + <field name="name">Human Resources / HR Officer</field> + <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/> + </record> + <record id="base.group_hr_manager" model="res.groups"> + <field name="name">Human Resources / HR Manager</field> + <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/> </record> - <record id="hr_dept_comp_rule" model="ir.rule"> <field name="name">Department multi company rule</field> <field model="ir.model" name="model_id" ref="model_hr_department"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> - <record id="hr_job_comp_rule" model="ir.rule"> <field name="name">Job multi company rule</field> <field model="ir.model" name="model_id" ref="model_hr_job"/> diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv index 569ac576db7..975ed7d4071 100644 --- a/addons/hr/security/ir.model.access.csv +++ b/addons/hr/security/ir.model.access.csv @@ -8,5 +8,4 @@ "access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0 "access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1 "access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1 -"access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1 "access_ir_property_hr_user","ir_property hr_user","base.model_ir_property","base.group_hr_user",1,1,1,0 |