From a446dfb18e151f53539e7a4283504319a73e27b1 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 3 Aug 2010 18:41:17 +0530
Subject: [PATCH] [MOD] hr_* :Improvement in hr_* modules groups and
 accessright

bzr revid: dbr@tinyerp.com-20100803131117-jkvf2a7pe955en2u
---
 addons/hr/hr_department_view.xml               |  1 -
 addons/hr/hr_view.xml                          |  6 ++----
 addons/hr/security/hr_security.xml             |  4 ++--
 addons/hr/security/ir.model.access.csv         | 18 +++++++++++-------
 addons/hr_attendance/hr_attendance_view.xml    |  3 +--
 .../hr_attendance/security/ir.model.access.csv |  3 ++-
 .../wizard/hr_attendance_sign_in_out_view.xml  |  2 +-
 .../hr_contract/security/ir.model.access.csv   | 16 ++++++----------
 addons/hr_evaluation/hr_evaluation_view.xml    | 10 ++++------
 .../hr_evaluation/security/ir.model.access.csv | 16 +++++++++-------
 addons/hr_expense/hr_expense_view.xml          |  5 ++---
 addons/hr_expense/security/ir.model.access.csv | 10 +++++++---
 addons/hr_holidays/hr_holidays_view.xml        |  3 +--
 .../hr_holidays/security/ir.model.access.csv   | 16 ++++++++--------
 .../security/ir.model.access.csv               |  8 ++++----
 addons/hr_timesheet/hr_timesheet_view.xml      |  1 -
 .../hr_timesheet/security/ir.model.access.csv  | 10 ++++++----
 .../wizard/hr_timesheet_print_users_view.xml   |  2 +-
 addons/survey/security/ir.model.access.csv     | 13 +++++++++++++
 addons/survey/security/survey_security.xml     |  6 ++++++
 20 files changed, 86 insertions(+), 67 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 1b96956394f..29e3b04f2c9 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -72,7 +72,6 @@
             <field name="res_model">hr.department</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_department_filter"/>
-            <field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
         </record>
 
        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6d826db1a6b..e803bf3221b 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -4,8 +4,8 @@
 
         <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
-        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="group_hr_manager" sequence="50"/>
-        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" groups="group_hr_manager" sequence="1"/>
+        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
+        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" groups="base.group_hr_manager" sequence="1"/>
         <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1"/>
 
         <!--
@@ -147,7 +147,6 @@
             <field name="domain">[]</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
-            <field name="help">The employee directory contains all data related to your employees: from their photo up to their hourly estimated costs for the timesheets. Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
@@ -392,7 +391,6 @@
             <field name="res_model">hr.job</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
         <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root"/>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index bc8e7ec2496..4f7691f03e9 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -2,11 +2,11 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_hr_manager" model="res.groups">
+    <record id="base.group_hr_manager" model="res.groups">
         <field name="name">Human Resources / Manager</field>
     </record>
 
-    <record id="group_hr_user" model="res.groups">
+    <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
 
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 2cdfd060faa..c85b5944cbe 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,9 +1,13 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_category","hr.employee.category","model_hr_employee_category","hr.group_hr_user",1,0,0,0
-"access_hr_employee","hr.employee","model_hr_employee","hr.group_hr_user",1,1,1,1
-"access_hr_employee_resource","resource.resource","resource.model_resource_resource","hr.group_hr_user",1,1,1,1
-"access_hr_department","hr.department","model_hr_department","hr.group_hr_user",1,0,0,0
-"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","hr.group_hr_manager",1,1,1,1
-"access_hr_department_manager","hr.department.manager","model_hr_department","hr.group_hr_manager",1,1,1,1
+"access_hr_employee_category","hr.employee.category","model_hr_employee_category","base.group_hr_user",1,0,0,0
+"access_hr_employee","hr.employee","model_hr_employee","base.group_hr_user",1,1,1,1
+"access_hr_employee_resource","resource.resource","resource.model_resource_resource","base.group_hr_user",1,1,1,1
+"access_hr_department","hr.department","model_hr_department","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
+"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
 "access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1
-"access_hr_job","hr.job","model_hr_job","hr.group_hr_user",1,0,0,0
+"access_hr_job","hr.job","model_hr_job","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,0,0,0
+"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
+"access_hr_employee_resource","resource.resource","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
+"access_hr_department","hr.department","model_hr_department","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index f6d7365356f..aa8a3aeeb82 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -71,11 +71,10 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_employee":1}</field>
             <field name="search_view_id" ref="view_hr_attendance_filter" />
-            <field name="help">Time Tracking functionality aims to manage employee's attendances on the basis of the actions (Sign in/Sign out) performed by them. You can also link this to an attndance machine using OpenERP's webservices features.</field>
         </record>
 
         <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3"/>
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking"       groups="hr.group_hr_manager" sequence="3"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking" groups="base.group_hr_manager,base.group_hr_user" sequence="3"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index ca7faa5c6f8..ed323b0de09 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,6 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","hr_attendance.group_hr_attendance",1,0,0,0
-"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","hr.group_hr_manager",1,1,1,1
+"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","base.group_hr_manager",1,1,1,1
+"access_hr_action_reason_employee_user","hr action reason employee user","model_hr_attendance","base.group_hr_user",1,1,1,1
 "access_hr_attendance_employee","hr attendance employee","model_hr_attendance","hr_attendance.group_hr_attendance",1,1,1,1
 "access_hr_employee_attendance","hr employee attendance sign in out","hr.model_hr_employee","hr_attendance.group_hr_attendance",1,0,0,0
 "access_hr_attendance_resource","hr resource attendance sign in out","resource.model_resource_resource","hr_attendance.group_hr_attendance",1,0,0,0
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index ff366fcbce9..88e241ffb60 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -47,7 +47,7 @@
         </record>
 
         <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
-            parent="menu_hr_time_tracking" sequence="4"/>
+            parent="menu_hr_time_tracking" sequence="4" groups="base.group_hr_manager,base.group_hr_user"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 5237b6c01d4..7640bb4792f 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,15 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_contract_wage_type_period_user","hr.contract.wage.type.period user","model_hr_contract_wage_type_period","hr.group_hr_user",1,0,0,0
-"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","hr.group_hr_manager",1,1,1,1
-"access_hr_contract_wage_type_user","hr.contract.wage.type user","model_hr_contract_wage_type","hr.group_hr_user",1,0,0,0
-"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","hr.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1
 "access_hr_contract_wage_type_contract","hr.contract.wage.type contract","model_hr_contract_wage_type","group_hr_contract",1,1,1,1
 "access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period contract","model_hr_contract_wage_type_period","group_hr_contract",1,1,1,1
-"access_hr_contract_user","hr.contract user","model_hr_contract","hr.group_hr_user",1,0,0,0
 "access_hr_contract","hr.contract","model_hr_contract","group_hr_contract",1,1,1,1
-"access_hr_employee_contract","hr.employee contract","hr.model_hr_employee","group_hr_contract",1,0,0,0
-"access_hr_resource_contract","hr.employee.resource contract","resource.model_resource_resource","group_hr_contract",1,0,0,0
-"access_hr_resource_calendar_contract","hr.employee.resource.calendar contract","resource.model_resource_calendar","group_hr_contract",1,0,0,0
-"access_hr_job_contract","hr.employee.job contract","hr.model_hr_job","group_hr_contract",1,0,0,0
-"access_hr_contract_type_user","hr.contract.type user","model_hr_contract_type","hr.group_hr_user",1,0,0,0
+"access_hr_employee_contract","hr.employee contract","hr.model_hr_employee","group_hr_contract",1,1,1,1
+"access_hr_resource_contract","hr.employee.resource contract","resource.model_resource_resource","group_hr_contract",1,1,1,1
+"access_hr_resource_calendar_contract","hr.employee.resource.calendar contract","resource.model_resource_calendar","group_hr_contract",1,1,1,1
+"access_hr_job_contract","hr.employee.job contract","hr.model_hr_job","group_hr_contract",1,1,1,1
 "access_hr_contract_type","hr.contract.type","model_hr_contract_type","group_hr_contract",1,1,1,1
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 0feba1cdfe3..44be7549dd3 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -62,7 +62,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
+        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6" groups="base.group_hr_manager"/>
         <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_system"/>
         <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
@@ -173,7 +173,7 @@
                         </page>
                         <page string="Internal Notes">
                             <field name="note_action" colspan="4" nolabel="1"
-                                groups="hr.group_hr_manager"/>
+                                groups="base.group_hr_manager"/>
                         </page>
                         <page string="Public Notes">
                             <field name="note_summary" colspan="4" nolabel="1"/>
@@ -261,7 +261,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="hr_evaluation.evaluation_search"/>
-            <field name="help">Each employee can be assigned to an evaluation plan. These plans define the frequency and the way you manage your periodic personnal evalautions. You will be able to define steps and attach interview forms to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self evaluation and final evaluation by the manager.</field>
         </record>
 
         <menuitem name="Evaluation" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
@@ -348,12 +347,11 @@
             <field name="domain">[('is_evaluation' ,'=', True)]</field>
             <field name="context">{"search_default_todo":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
-            <field name="help">Interview Requests are generated automatically by OpenERP according to employees evaluation plan. Each user receives automatic emails and requests to perform evaluation of their collegues periodically.</field>
         </record>
 
-        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
+        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests" groups="base.group_hr_manager" 
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
+        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail" groups="base.group_hr_manager"
            action="action_hr_evaluation_send_mail" sequence="45"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index a58c3298617..104fdf152c6 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,8 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation","hr.group_hr_user",1,1,1,1
-"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation","hr.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan","hr.group_hr_manager",1,1,1,1
-"access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","hr.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","hr.group_hr_manager",1,1,1,1
-"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_user",1,1,1,1
-"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","hr.group_hr_manager",1,1,1,1
+"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation","model_hr_evaluation_evaluation","base.group_hr_manager",1,1,1,1
+"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation","base.group_hr_user",1,0,0,0
+"access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan","base.group_hr_manager",1,1,1,1
+"access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","base.group_hr_user",1,0,0,0
+"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","base.group_hr_manager",1,1,1,1
+"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview","base.group_hr_manager",1,1,1,1
+"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 0e4a1c34095..820c67da6dc 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -158,11 +158,10 @@
             <field name="view_type">form</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
-            <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root"/>
-        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49" groups="hr.group_hr_manager"/>
+        <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root" groups="base.group_hr_user"/>
+        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49" groups="base.group_hr_manager,base.group_hr_user"/>
 
         <record id="view_product_hr_expense_form" model="ir.ui.view">
             <field name="name">product.product.expense.form</field>
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index c6f2cdef8d1..ffccde210f9 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,4 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","hr.group_hr_user",1,1,1,1
-"access_hr_expense_line","hr.expense.line","model_hr_expense_line","hr.group_hr_user",1,1,1,1
-"access_hr_expense_report","hr.expense.report","model_hr_expense_report","hr.group_hr_manager",1,1,1,1
+"access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","base.group_hr_user",1,1,1,1
+"access_hr_expense_line","hr.expense.line","model_hr_expense_line","base.group_hr_user",1,1,1,1
+"access_hr_expense_report","hr.expense.report","model_hr_expense_report","base.group_hr_manager",1,1,1,1
+"access_product_product_hr_expense","product.product.hr.expense","product.model_product_product","base.group_hr_user",1,0,0,0
+"access_product_template_hr_expense","product.template.hr.expense","product.model_product_template","base.group_hr_user",1,0,0,0
+"access_product_uom_hr_expense","product.uom.hr.expense","product.model_product_uom","base.group_hr_user",1,0,0,0
+"access_product_price_type","product.price.type","product.model_product_price_type","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 73aedac2c5f..f0d312bd9b4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -253,7 +253,6 @@
             <field name="domain">[('type','=','remove')]</field>
             <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
-            <field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
@@ -314,7 +313,7 @@
             parent="menu_open_ask_holidays"
             id="menu_open_company_allocation"
             action="open_company_allocation"
-            groups="hr.group_hr_manager"
+            groups="base.group_hr_manager"
             sequence="40"/>
 
         <!-- holidays status -->
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index aee09a1f831..279eb8a7c1d 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,9 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,0,0,0
-"access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,0
-"access_hr_holydays_status_manager","hr.holidays.status manager","model_hr_holidays_status","hr.group_hr_manager",1,1,1,1
-"access_hr_holidays_manager","hr holidays manager","model_hr_holidays","hr.group_hr_manager",1,1,1,1
-"access_hr_holidays_remain","hr holidays user","model_hr_holidays_remaining_leaves_user","hr.group_hr_user",1,0,0,0
-"access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","hr.group_hr_manager",1,1,1,1
-"access_hr_holidays_remaining_leaves_user","hr.hr.holidays.remaining.leaves.user","model_hr_holidays_remaining_leaves_user","hr.group_hr_manager",1,1,1,1
-"access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","hr.group_hr_manager",1,1,1,1
+"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,0,0,0
+"access_hr_holidays_user","hr holidays user","model_hr_holidays","base.group_hr_user",1,1,1,0
+"access_hr_holydays_status_manager","hr.holidays.status manager","model_hr_holidays_status","base.group_hr_manager",1,1,1,1
+"access_hr_holidays_manager","hr holidays manager","model_hr_holidays","base.group_hr_manager",1,1,1,1
+"access_hr_holidays_remain","hr holidays user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,0,0,0
+"access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","base.group_hr_manager",1,1,1,1
+"access_hr_holidays_remaining_leaves_user","hr.hr.holidays.remaining.leaves.user","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,1,1,1
+"access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index bad86afd5c0..b951e28a74b 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_applicant","hr.applicant","model_hr_applicant","hr.group_hr_user",1,1,1,1
-"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","hr.group_hr_manager",1,0,0,0
-"access_hr_recruitment_stage","hr.recruitment.stage","model_hr_recruitment_stage","hr.group_hr_user",1,1,1,1
-"access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","hr.group_hr_user",1,1,1,1
+"access_hr_applicant","hr.applicant","model_hr_applicant","base.group_hr_user",1,1,1,1
+"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","base.group_hr_manager",1,0,0,0
+"access_hr_recruitment_stage","hr.recruitment.stage","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
+"access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d612706257f..f6527d5c6e8 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -83,7 +83,6 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
-            <field name="help">This functionality gives you a list of work done by user, product and analytic account (or project). A search tool allows you to make fine-grained analysis.</field>
         </record>
 
 		<menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 2ae7f12464a..ad3583bfab9 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,5 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","hr.group_hr_user",1,1,1,1
-"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","hr.group_hr_user",1,1,1,0
-"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","hr.group_hr_user",1,0,0,0
-"access_product_product_user","product.product user","product.model_product_product","hr.group_hr_user",1,0,0,0
+"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_hr_user",1,1,1,1
+"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,0
+"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,0,0,0
+"access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,0,0,0
+"access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,0,0,0
+"access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,0,0,0
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index cb51fcc1cb3..d71946abfd9 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -38,7 +38,7 @@
         <menuitem action="action_hr_timesheet_users"
         	id="menu_hr_timesheet_users"
         	parent="menu_hr_reporting_timesheet"
-        	groups="hr.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
+        	groups="base.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
 
 
      </data>
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 22902858577..aebd468c0a0 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -23,3 +23,16 @@
 "access_survey_response_line","survey.response.line","model_survey_response_line","group_survey_manager",1,1,1,1
 "access_survey_response_line","survey.response.line","model_survey_response_line","group_survey_user",1,1,1,1
 "access_survey_name_wiz_sale","survey.name.wiz.sale","model_survey_name_wiz","base.group_sale_salesman",1,1,0,0
+"access_survey_type","survey.type","model_survey_type","base.group_hr_manager",1,1,1,1
+"access_survey","survey","model_survey","base.group_hr_manager",1,1,1,1
+"access_survey_history","survey.history","model_survey_history","base.group_hr_manager",1,1,1,1
+"access_survey_page","survey.page","model_survey_page","base.group_hr_manager",1,1,1,1
+"access_survey_question","survey.question","model_survey_question","base.group_hr_manager",1,1,1,1
+"access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","base.group_hr_manager",1,1,1,1
+"access_survey_answer","survey.answer","model_survey_answer","base.group_hr_manager",1,1,1,1
+"access_survey_response","survey.response","model_survey_response","base.group_hr_manager",1,1,1,1
+"access_survey_response_line","survey.response.line","model_survey_response_line","base.group_hr_manager",1,1,1,1
+"access_survey_tbl_column_heading","survey.tbl.column.heading","model_survey_tbl_column_heading","base.group_hr_manager",1,1,1,1
+"access_survey_response_answer","survey.response.answer","model_survey_response_answer","base.group_hr_manager",1,1,1,1
+"access_survey_res_users","res.users","base.model_res_users","base.group_hr_manager",1,1,1,1
+"access_survey_request","survey.request","model_survey_request","base.group_hr_manager",1,1,1,1
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index d85df3508b7..67494b5a293 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -5,6 +5,12 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / Salesman</field>
     </record>
+    <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 / User</field>
+    </record>
 
 </data>
 </openerp>