From 6fd9d3bb9cf7b5bafb2ed83525a4991678bb7628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Degrave?= <fde@openerp.com>
Date: Wed, 29 Dec 2010 08:39:56 +0100
Subject: [PATCH] [IMP+FIX] HR access rights, menus

bzr revid: fde@openerp.com-20101229073956-oze90c0gwlkk4s9t
---
 addons/hr/security/ir.model.access.csv             |  1 +
 addons/hr_contract/hr_contract_view.xml            | 14 --------------
 .../security/ir.model.access.csv                   |  2 ++
 addons/hr_recruitment/security/ir.model.access.csv |  2 ++
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index ab8eb568264..042e9e09e23 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,1,1,1
+"access_hr_employee_category_emp","hr.employee.category.emp","model_hr_employee_category","base.group_hr_user",1,0,0,0
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
 "access_hr_employee_system_user","hr.employee system user","model_hr_employee","base.group_user",1,0,0,0
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index dbb4a648f0c..3fe9338bd69 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -120,24 +120,10 @@
                         <field name="medic_exam" />
                         </group>
                     </page>
-                    <page string="Contracts">
-                        <field colspan="4" name="contract_ids" nolabel="1"/>
-                    </page>
                 </page>
             </field>
         </record>
 
-        <record id="hr_employee_view_form3" model="ir.ui.view">
-            <field name="name">hr.employee.view.form3</field>
-            <field name="model">hr.employee</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-                <field name="parent_id" position="after">
-                    <field name="contract_id"/>
-                </field>
-            </field>
-        </record>
 
         <record id="hr_contract_view_search" model="ir.ui.view">
             <field name="name">hr.contract.view.search</field>
diff --git a/addons/hr_payroll_account/security/ir.model.access.csv b/addons/hr_payroll_account/security/ir.model.access.csv
index d71b8404a12..32f98a3a9ff 100644
--- a/addons/hr_payroll_account/security/ir.model.access.csv
+++ b/addons/hr_payroll_account/security/ir.model.access.csv
@@ -1,2 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_payslip_account_move_user","access.hr.payslip.account.move.user","model_hr_payslip_account_move","base.group_user",1,0,0,0
+"access_hr_payslip_user","access.hr.payslip.user","model_hr_payslip","base.group_user",1,0,0,0
+"access_hr_payslip_line_user","access.hr.payslip.line.user","model_hr_payslip_line","base.group_user",1,0,0,0
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 5e343a40fa0..948c0aa0c47 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -7,3 +7,5 @@
 "access_res_partner_hr_user","res.partner.user","base.model_res_partner","base.group_hr_user",1,1,1,1
 "access_res_partner_address_hr_user","res.partner.address.user","base.model_res_partner_address","base.group_hr_user",1,1,1,1
 "access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
+"access_crm_phonecall_hruser","crm.phonecall hruser","crm.model_crm_phonecall","base.group_hr_user",1,1,1,1
+"access_crm_meeting_hruser","crm.meeting.hruser","crm.model_crm_meeting","base.group_hr_user",1,1,1,1