From f7323eb1af7e0f383305db2228b60919a9fb2487 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 8 Apr 2011 18:31:16 +0200
Subject: [IMP] hr: replaced marital.status object by a fields.selection to
 ease to use in payroll module

bzr revid: qdp-launchpad@openerp.com-20110408163116-3qmhc4phurtpuzmf
---
 addons/hr/security/ir.model.access.csv | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/hr/security')

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
-- 
cgit v1.2.3


From ba6342174e4574c11aa273c9cdfa1e040d50f0b4 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 2 Aug 2011 15:08:11 +0200
Subject: add group implications

bzr revid: rco@openerp.com-20110802130811-pkdmw43ufifz0tpj
---
 addons/hr/security/hr_security.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'addons/hr/security')

diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index aba7d4b45e1..aadadd224e9 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -2,12 +2,13 @@
 <openerp>
 <data noupdate="1">
 
+    <record id="base.group_hr_user" model="res.groups">
+        <field name="name">Human Resources / Officer</field>
+    </record>
     <record id="base.group_hr_manager" model="res.groups">
         <field name="name">Human Resources / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
     </record>
 
-    <record id="base.group_hr_user" model="res.groups">
-        <field name="name">Human Resources / Officer</field>
-    </record>
 </data>
 </openerp>
-- 
cgit v1.2.3


From fa7874cddc48e7ba4bd7f74ce5159351536d1514 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Mon, 15 Aug 2011 16:21:41 +0200
Subject: [IMP] Improved bank account management, report footer, stages by
 default on projects

bzr revid: fp@fp-laptop-20110815142141-938zg1laoe8wtbkd
---
 addons/hr/security/hr_security.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/hr/security')

diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index aadadd224e9..1ec0e42c47e 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -3,10 +3,10 @@
 <data noupdate="1">
 
     <record id="base.group_hr_user" model="res.groups">
-        <field name="name">Human Resources / Officer</field>
+        <field name="name">Human Resources / HR Officer</field>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
-        <field name="name">Human Resources / Manager</field>
+        <field name="name">Human Resources / HR Manager</field>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
     </record>
 
-- 
cgit v1.2.3


From d45883d44abd462958f46155b88cc00078ccb86c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 24 Aug 2011 17:11:43 +0200
Subject: [FIX] hr: HR Officer group should imply HR Employee group

Failure to have this dependency means that the drop-down for
HR permissions on the user will always only show Employee
even if the user also has Officer/Manager access

bzr revid: odo@openerp.com-20110824151143-cysnlvetzrvqrfs2
---
 addons/hr/security/hr_security.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/hr/security')

diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 1ec0e42c47e..9a85bf71016 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -4,6 +4,7 @@
 
     <record id="base.group_hr_user" model="res.groups">
         <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>
-- 
cgit v1.2.3