diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index 3a0cc29d428..8c5e4323831 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -8,8 +8,6 @@ access_document_directory_content_type_group_document_manager,document.directory
 access_document_directory_content_type_group_system,document.directory.content.type group system,model_document_directory_content_type,base.group_user,1,0,0,0
 access_ir_attachment_group_user,ir.attachment user,base.model_ir_attachment,base.group_document_user,1,1,1,1
 access_ir_attachment_group_system,ir.attachment system,base.model_ir_attachment,base.group_system,1,0,0,0
-access_ir_attachment_sale_manager,ir_attachment manager,base.model_ir_attachment,base.group_sale_manager,1,1,1,1
-access_ir_attachment_partner_manager,ir_attachment_partner manager,base.model_ir_attachment,base.group_partner_manager,1,1,1,1
 access_res_partner_group_user,res.partner user,base.model_res_partner,base.group_document_user,1,1,1,0
 access_document_directory_dctx_all,document.directory.dctx all,model_document_directory_dctx,,1,0,0,0
 access_document_directory_dctx_group_document_manager,document.directory.dctx document manager,model_document_directory_dctx,base.group_system,1,1,1,1
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 62ce66995ec..d1a85a17005 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -165,6 +165,7 @@ class hr_employee(osv.osv):
         'ssnid': fields.char('SSN No', help='Social Security Number'),
         'sinid': fields.char('SIN No', help="Social Insurance Number"),
         'identification_id': fields.char('Identification No'),
+        'otherid': fields.char('Other Id'),
         'gender': fields.selection([('male', 'Male'), ('female', 'Female'), ('other', 'Other')], 'Gender'),
         'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced')], 'Marital Status'),
         'department_id': fields.many2one('hr.department', 'Department'),
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 8b1bfe480c3..be7dfecdfdf 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -29,12 +29,12 @@
                             <h1>
                                 <field name="name"/>
                             </h1>
+                            <label for="category_ids" class="oe_edit_only" groups="base.group_hr_user"/>
+                            <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_user"/>
                             <label for="work_email" class="oe_edit_only"/>
                             <field name="work_email" widget="email"/>
                             <label for="work_phone" class="oe_edit_only"/>
                             <field name="work_phone"/>
-                            <label for="category_ids" class="oe_edit_only" groups="base.group_hr_user"/>
-                            <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_user"/>
                         </div>
                         <div class="oe_right oe_button_box" name="button_box">
                             <!-- Put here related buttons -->
@@ -50,11 +50,16 @@
                                         <field name="work_location"/>
                                     </group>
                                     <group string="Position">
-                                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                                        <field name="department_id" groups="hr.group_multi_departments" on_change="onchange_department_id(department_id)"/>
                                         <field name="job_id"/>
                                         <field name="parent_id"/>
                                         <field name="coach_id"/>
                                     </group>
+                                    <group>
+                                        <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
+                                        <field name="user_id" on_change="onchange_user(user_id)" string="Related User"
+                                            context="{'default_groups_ref': ['base.group_user']}"/>
+                                    </group>
                                 </group>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
                             </page>
@@ -65,6 +70,7 @@
                                         <field name="identification_id" groups="base.group_hr_user"/>
                                         <field name="passport_id" groups="base.group_hr_user"/>
                                         <field name="bank_account_id"/>
+                                        <field name="otherid" groups="base.group_hr_user"/>
                                     </group>
                                     <group string="Contact Information">
                                         <field name="address_home_id"
@@ -85,11 +91,6 @@
                                     <group string="Active" name="active_group">
                                         <field name="active"/>
                                     </group>
-                                    <group>
-                                        <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                                        <field name="user_id" on_change="onchange_user(user_id)" string="Related User"
-                                            context="{'default_groups_ref': ['base.group_user']}"/>
-                                    </group>
                                 </group>
                             </page>
                         </notebook>
@@ -111,7 +112,7 @@
                     <field name="work_phone"/>
                     <field name="work_email"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="hr.group_multi_departments"/>
                     <field name="job_id"/>
                     <field name="parent_id"/>
                     <field name="coach_id" invisible="1"/>
@@ -126,14 +127,14 @@
             <field name="arch" type="xml">
                 <search string="Employees">
                     <field name="name" string="Employees" filter_domain="['|',('work_email','ilike',self),('name','ilike',self)]"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="hr.group_multi_departments"/>
                     <field name="category_ids" groups="base.group_hr_user"/>
                     <field name="job_id" />
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <group expand="0" string="Group By">
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
                         <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
-                        <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Department" domain="[]" context="{'group_by':'department_id'}" groups="hr.group_multi_departments"/>
                         <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
@@ -249,7 +250,7 @@
                     <field name="work_phone"/>
                     <field name="work_email"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="hr.group_multi_departments"/>
                     <field name="job_id"/>
                     <field name="coach_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
@@ -357,7 +358,7 @@
                         </div>
                         <div class="oe_right" name="buttons"/>
                         <group name="employee_data">
-                            <field name="department_id" class="oe_inline"/>
+                            <field name="department_id" groups="hr.group_multi_departments" class="oe_inline"/>
                             <field name="no_of_recruitment" class="oe_inline" />
                         </group>
                         <div attrs="{'invisible': [('state', '!=', 'recruit')]}">
@@ -383,7 +384,7 @@
             <field name="arch" type="xml">
                 <tree string="Job" decoration-bf="message_unread==True">
                     <field name="name"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="hr.group_multi_departments"/>
                     <field name="no_of_employee"/>
                     <field name="no_of_recruitment"/>
                     <field name="expected_employees"/>
@@ -402,11 +403,11 @@
                     <field name="name" string="Job"/>
                     <filter domain="[('state','=','open')]" string="In Position"/>
                     <filter domain="[('state','=','recruit')]" string="In Recruitment" name="in_recruitment"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="hr.group_multi_departments"/>
                     <separator/>
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Department" domain="[]" context="{'group_by':'department_id'}" groups="hr.group_multi_departments"/>
                         <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
@@ -516,7 +517,7 @@
             id="menu_hr_department_tree"
             parent="menu_hr_root"
             sequence="1"
-            groups="base.group_hr_user"/>
+            groups="group_multi_departments"/>
 
     </data>
 </openerp>
diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index ff505ee1114..2ecf26bb0bc 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -32,6 +32,10 @@ class hr_config_settings(osv.osv_memory):
             help ="""This installs the module hr_payroll."""),
         'module_website_hr_recruitment': fields.boolean('Publish jobs on your website',
             help ="""This installs the module website_hr_recruitment"""),
+        'group_multi_departments': fields.boolean(
+            "Manage employees by department",
+            implied_group='hr.group_multi_departments', group="base.group_hr_user",
+            help="""Allows you to manage employees by department."""),
         'group_hr_attendance': fields.boolean('Track attendances for all employees',
             implied_group='base.group_hr_attendance',
             help="Allocates attendance group to all users."),
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 4f96791d8f8..5afa7e8ac45 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -12,4 +12,127 @@
             <field name="state">open</field>
         </record>
     </data>
+    <data>
+        <record id="open_payroll_modules" model="ir.actions.act_window">
+            <field name="name">Payroll</field>
+            <field name="res_model">ir.module.module</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context" eval="{'search_default_category_id': ref('base.module_category_localization')}"/>
+            <field name="search_view_id" ref="base.view_module_filter"/>
+        </record>
+
+        <record id="view_human_resources_configuration" model="ir.ui.view">
+            <field name="name">hr settings</field>
+            <field name="model">hr.config.settings</field>
+            <field name="arch" type="xml">
+                <form string="Configure Human Resources" class="oe_form_configuration">
+                    <header>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+                    </header>
+                    <separator string="Human Resources Management"/>
+                    <group name="recruitment_grp">
+                        <label for="id" string="Talent Management"/>
+                        <div name="recruitment">
+                            <div name="hr_recruitment">
+                                <field name="module_hr_recruitment" class="oe_inline"/>
+                                <label for="module_hr_recruitment"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_evaluation" class="oe_inline"/>
+                                <label for="module_hr_evaluation"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group>
+                        <label for="id" string="Additional Features"/>
+                        <div>
+                            <div>
+                                <field name="module_hr_holidays" class="oe_inline"/>
+                                <label for="module_hr_holidays"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_expense" class="oe_inline"/>
+                                <label for="module_hr_expense"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_gamification" class="oe_inline"/>
+                                <label for="module_hr_gamification"/>
+                            </div>
+                            <div>
+                                <field name="group_multi_departments" class="oe_inline"/>
+                                <label for="group_multi_departments"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group name="timesheet_grp">
+                        <label for="id" string="Time Tracking"/>
+                        <div>
+                            <div>
+                                <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)" class="oe_inline"/>
+                                <label for="module_hr_timesheet"/>
+                            </div>
+                            <div name="hr_timesheet">
+                                <field name="module_hr_timesheet_sheet" class="oe_inline"/>
+                                <label for="module_hr_timesheet_sheet"/>
+                            </div>
+                            <div name="account_analytic_analysis">
+                                <field name="module_account_analytic_analysis" class="oe_inline"/>
+                                <label for="module_account_analytic_analysis"/>
+                            </div>
+                            <div name="hr_attendance">
+                                <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
+                                <label for="module_hr_attendance"/>
+                            </div>
+                            <div>
+                                <field name="group_hr_attendance" on_change="onchange_group_hr_attendance(group_hr_attendance)" class="oe_inline"/>
+                                <label for="group_hr_attendance"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group name="contract_grp">
+                        <label for="id" string="Contracts"/>
+                        <div>
+                            <div>
+                                <field name="module_hr_contract" class="oe_inline"/>
+                                <label for="module_hr_contract"/>
+                            </div>
+                            <div name="hr_payroll">
+                                <field name="module_hr_payroll" class="oe_inline"/>
+                                <label for="module_hr_payroll"/>
+                                <button name="%(open_payroll_modules)d" type="action"
+                                    string="Install your country's payroll" icon="gtk-go-forward"
+                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group name="website_grp">
+                        <label for="id" string="Website"/>
+                        <div>
+                            <div>
+                                <field name="module_website_hr_recruitment" class="oe_inline"/>
+                                <label for="module_website_hr_recruitment"/>
+                            </div>
+                        </div>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_human_resources_configuration" model="ir.actions.act_window">
+            <field name="name">Configure Human Resources</field>
+            <field name="res_model">hr.config.settings</field>
+            <field name="view_id" ref="view_human_resources_configuration"/>
+            <field name="view_mode">form</field>
+            <field name="target">inline</field>
+        </record>
+
+        <menuitem id="menu_human_resources_global_settings" name="Settings" 
+            parent="menu_human_resources_configuration" 
+            action="action_human_resources_configuration"
+            sequence="0"/>
+
+
+    </data>
 </openerp>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index a16f8074cf8..114cea97591 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -25,6 +25,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_multi_departments" model="res.groups">
+        <field name="name">Manage employees by department</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
 </data>
 <data noupdate="1">
 
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index ee616be243f..82bf78f02d5 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -174,5 +174,21 @@
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" 
             parent="menu_hr_attendance_config" groups="base.group_hr_attendance" sequence="1"/>
 
+        <record id="hr_attendance_employee" model="ir.ui.view">
+            <field name="name">hr.employee.form1</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <field name="active" position="before">
+                    <label for="state" groups="base.group_hr_attendance"/>
+                    <div groups="base.group_hr_attendance">
+                        <field name="state" class="oe_inline"/> -
+                        <button class="oe_link" name="attendance_action_change" states="present" string="Sign Out" type="object" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+                        <button class="oe_link" name="attendance_action_change" states="absent" string="Sign In" type="object" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                    </div>
+                </field>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 652a8acb88d..59cf0d4e4c4 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -29,7 +29,7 @@
                         </button>
                     </xpath>
                     <xpath expr="//field[@name='coach_id']" position="after">
-                        <field name="manager" groups="base.group_no_one"/>
+                        <field name="manager"/>
                     </xpath>
                     <xpath expr="//group[@name='active_group']" position="before">
                         <group string="Current Contract">
@@ -61,7 +61,7 @@
                     <field name="date_end"/>
                     <field name="working_hours"/>
                     <field name="employee_id"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="hr.group_multi_departments"/>
                     <field name="state"/>
                     <filter string="To Renew" name="to_renew" domain="[('state', '=', 'pending')]"/>
                     <separator />
@@ -98,7 +98,7 @@
                             <field name="job_id"/>
                         </group>
                         <group>
-                            <field name="department_id"/>
+                            <field name="department_id" groups="hr.group_multi_departments"/>
                             <field name="type_id"/>
                         </group>
                     </group>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index f2c2c704fd8..d62a883779a 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -46,7 +46,7 @@
                 <tree decoration-warning="state == 'draft'" decoration-muted="state == 'cancelled'" string="Expenses" editable="top">
                     <field name="employee_id"/>
                     <field name="date"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="hr.group_multi_departments"/>
                     <field name="name" string="Expense Sheet"/>
                     <field name="amount" widget="monetary"/>
                     <field name="state"/>
@@ -76,7 +76,7 @@
                         <group>
                             <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                             <field name="date"/>
-                            <field name="department_id"/>
+                            <field name="department_id" groups="hr.group_multi_departments"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                         <group>
@@ -159,7 +159,7 @@
                     <field name="name" string="Expenses"/>
                     <field name="date"/>
                     <field name="employee_id"/>
-                    <field name="department_id" string="Department" context="{'invisible_department': False}"/>
+                    <field name="department_id" groups="hr.group_multi_departments" string="Department" context="{'invisible_department': False}"/>
                     <filter domain="[('state','=','draft')]" string="New" help="New Expense"/>
                     <filter domain="[('state','=','confirm')]" string="To Approve" name="confirm" help="Confirmed Expenses"/>
                     <filter domain="[('state','=','accepted')]" string="To Pay" name="approved" help="Expenses to Invoice"/>
@@ -170,7 +170,7 @@
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <group expand="0" string="Group By">
                         <filter string="Employee" domain="[]" context="{'group_by':'employee_id'}"/>
-                        <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Department" domain="[]" context="{'group_by':'department_id'}" groups="hr.group_multi_departments"/>
                         <filter string="Expenses Month" domain="[]" context="{'group_by':'date'}" help="Expenses by Month"/>
                     </group>
                     <separator />
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index b6d254a4da6..64f8486e268 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -36,7 +36,7 @@
                 <filter string="Approved" domain="[('state','=','accepted')]" help="Approved Expenses"/>
                 <filter string="Done" domain="[('state','=', 'done')]" help="Done Expenses"/>
                 <field name="employee_id"/>
-                <field name="department_id"/>
+                <field name="department_id" groups="hr.group_multi_departments"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="product_id"/>
                     <field name="user_id"/>
@@ -47,7 +47,7 @@
                 </group>
                 <group expand="1" string="Group By">
                     <filter string="Validation User" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Department" context="{'group_by':'department_id'}"/>
+                    <filter string="Department" groups="hr.group_multi_departments" context="{'group_by':'department_id'}"/>
                     <filter string="Product" context="{'group_by':'product_id'}"/>
                     <filter string="Status" context="{'group_by':'state'}"/>
                     <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
diff --git a/addons/hr_gamification/views/gamification.xml b/addons/hr_gamification/views/gamification.xml
index 8dfad81ed65..c3299a3c24b 100644
--- a/addons/hr_gamification/views/gamification.xml
+++ b/addons/hr_gamification/views/gamification.xml
@@ -34,6 +34,9 @@
                         </div>
                         <field name="badge_ids" widget="many2many_kanban" />
                     </page>
+                    <page string="Goals">
+                        <field name="goal_ids" widget="many2many_kanban" />
+                    </page>
                 </xpath>
 
             </field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 837aefd28a0..e98d4234033 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -35,7 +35,7 @@
                     <separator/>
                     <filter string="To Do" name="todo" domain="[('payslip_status', '=', False), ('holiday_status_id.active', '=', True)]"/>
                     <field name="employee_id"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="hr.group_multi_departments"/>
                     <field name="holiday_status_id"/>
                     <group expand="0" string="Group By">
                         <filter name="group_name" string="Description" context="{'group_by':'name'}"/>
@@ -581,6 +581,14 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//group[@name='active_group']" position="before">
+                    <group string="Leaves" groups="base.group_no_one">
+                        <label for="remaining_leaves"/>
+                        <div>
+                            <field name="remaining_leaves" class="oe_inline"/> days
+                        </div>
+                    </group>
+                </xpath>
                 <xpath expr="//div[@name='button_box']" position="inside">
                     <button name="%(act_hr_employee_holiday_request_approved)d"
                             icon="fa-calendar"
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index b728125c22b..11ede32164b 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="open_payroll_modules" model="ir.actions.act_window">
-            <field name="name">Payroll</field>
-            <field name="res_model">ir.module.module</field>
-            <field name="view_mode">kanban,tree,form</field>
-            <field name="context" eval="{'search_default_category_id': ref('base.module_category_localization')}"/>
-            <field name="search_view_id" ref="base.view_module_filter"/>
-        </record>
-
         <record id="view_hr_payroll_configuration" model="ir.ui.view">
             <field name="name">Configure Payroll</field>
             <field name="model">hr.payroll.config.settings</field>
@@ -26,14 +18,6 @@
                             <field name="module_hr_payroll_account" class="oe_inline"/>
                             <label for="module_hr_payroll_account"/>
                         </div>
-                        <label for="id" string="Contracts"/>
-                        <div>
-                            <div name="hr_payroll">
-                                <button name="%(open_payroll_modules)d" type="action"
-                                    string="Install your country's payroll" icon="gtk-go-forward"
-                                    class="oe_link"/>
-                            </div>
-                        </div>
                     </group>
                 </form>
             </field>
diff --git a/addons/hr_payroll/views/report_payslip.xml b/addons/hr_payroll/views/report_payslip.xml
index 2fe6636dd6e..b30cb089d1a 100644
--- a/addons/hr_payroll/views/report_payslip.xml
+++ b/addons/hr_payroll/views/report_payslip.xml
@@ -33,6 +33,7 @@
                             <td><strong>Reference</strong></td>
                             <td><span t-field="o.number"/></td>
                             <td><strong>Bank Account</strong></td>
+                            <td><span t-field="o.employee_id.otherid"/></td>
                         </tr>
                         <tr>
                             <td><strong>Date From</strong></td>
diff --git a/addons/hr_payroll/views/report_payslipdetails.xml b/addons/hr_payroll/views/report_payslipdetails.xml
index cdf1b3e7c2e..acd0fbc2610 100644
--- a/addons/hr_payroll/views/report_payslipdetails.xml
+++ b/addons/hr_payroll/views/report_payslipdetails.xml
@@ -33,6 +33,7 @@
                             <td><strong>Reference</strong></td>
                             <td><span t-field="o.number"/></td>
                             <td><strong>Bank Account</strong></td>
+                            <td><span t-field="o.employee_id.otherid"/></td>
                         </tr>
                         <tr>
                             <td><strong>Date From</strong></td>
diff --git a/addons/hr_recruitment/hr_recruitment_dashboard.xml b/addons/hr_recruitment/hr_recruitment_dashboard.xml
index b2121a52bb8..75d4a4564a1 100644
--- a/addons/hr_recruitment/hr_recruitment_dashboard.xml
+++ b/addons/hr_recruitment/hr_recruitment_dashboard.xml
@@ -33,7 +33,7 @@
                                 <div class="o_kanban_card_header_title">
                                     <div class="o_primary"><t t-esc="record.name.value"/></div>
                                     <div class="o_secondary">
-                                        <span><t t-esc="record.department_id.value"/></span>
+                                        <span groups="hr.group_multi_departments"><t t-esc="record.department_id.value"/></span>
                                         <span t-if="record.manager_id.value">(<t t-esc="record.manager_id.value"/>)</span>
                                         <small t-if="record.alias_name.value and record.alias_domain.value and record.state.raw_value == 'recruit'"><i class="fa fa-envelope-o"></i> <field name="alias_id"/></small>
                                     </div>
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 4f26cd4bba8..f4bbdd0ffa8 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -42,7 +42,7 @@
         <field name="subject">Welcoming ${object.name} </field>
         <field name="body_html"><![CDATA[
             <p>
-                %if object.department_id:
+                %if user.has_group('hr.group_multi_departments') and object.department_id:
                     I’m very pleased to announce that <strong> ${object.name} </strong> will be joining us as a ${object.job_id.name}
                     in ${object.department_id.name}.
                 %else:
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 017c4634cc3..c3685c5f880 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -202,7 +202,7 @@
                 <separator/>
                 <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <field name="job_id"/>
-                <field name="department_id"/>
+                <field name="department_id" groups="hr.group_multi_departments"/>
                 <field name="user_id"/>
                 <field name="stage_id" domain="[]"/>
                 <separator/>
@@ -260,7 +260,7 @@
                         <ul class="oe_kanban_tooltip">
                             <li t-if="record.type_id.raw_value"><b>Degree:</b> <field name="type_id"/></li>
                             <li t-if="record.partner_id.raw_value"><b>Contact:</b> <field name="partner_id"/></li>
-                            <li t-if="record.department_id.raw_value"><b>Departement:</b> <field name="department_id"/></li>
+                            <li t-if="record.department_id.raw_value"><b>Departement:</b> <field name="department_id" groups="hr.group_multi_departments"/></li>
                         </ul>
                     </t>
                     <t t-name="kanban-box">
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 636a7dad9de..29f79da1529 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -202,10 +202,10 @@
                     <filter name="to_approve" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <field name="employee_id"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="hr.group_multi_departments"/>
                     <group expand="0" string="Group By">
                         <filter string="Employees" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                        <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Department" domain="[]" context="{'group_by':'department_id'}" groups="hr.group_multi_departments"/>
                     </group>
                 </search>
             </field>
@@ -256,14 +256,6 @@
                     <group name="timesheets_grp" string="Timesheets">
                         <field name="timesheet_range"/>
                         <field name="timesheet_max_difference"/>
-                        <div>
-                            <label for="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
-                            <field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
-                        </div>
-                        <div>
-                            <label for="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
-                            <field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
-                        </div>
                     </group>
                 </xpath>
             </field>
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index 97dd260c129..6c52a907724 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -7,4 +7,23 @@
             <field name="state">open</field>
         </record>
     </data>
+    <data>
+        <record id="view_hr_timehseet_config_settings" model="ir.ui.view">
+            <field name="name">hr settings for timesheets</field>
+            <field name="model">hr.config.settings</field>
+            <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='hr_timesheet']" position="after">
+                    <div>
+                        <label for="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
+                        <field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
+                    </div>
+                    <div>
+                        <label for="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
+                        <field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/l10n_in_hr_payroll/views/report_hryearlysalary.xml b/addons/l10n_in_hr_payroll/views/report_hryearlysalary.xml
index fbc1ee307b2..189dfd29e5a 100644
--- a/addons/l10n_in_hr_payroll/views/report_hryearlysalary.xml
+++ b/addons/l10n_in_hr_payroll/views/report_hryearlysalary.xml
@@ -38,6 +38,12 @@
                                     <span t-field="employee.name"/>
                                 </t>
                             </td>
+                            <td><strong>Other No.</strong></td>
+                            <td>
+                                <t t-if="employee.otherid">
+                                    <span t-field="employee.otherid"/>
+                                </t>
+                            </td>
                             <td><strong>Address</strong></td>
                             <td>
                                 <t t-if="employee.address_home_id">
diff --git a/addons/l10n_in_hr_payroll/views/report_payslipdetails.xml b/addons/l10n_in_hr_payroll/views/report_payslipdetails.xml
index 92f37e79cfa..426a71de1ee 100644
--- a/addons/l10n_in_hr_payroll/views/report_payslipdetails.xml
+++ b/addons/l10n_in_hr_payroll/views/report_payslipdetails.xml
@@ -33,6 +33,7 @@
                             <td><strong>Reference</strong></td>
                             <td><span t-field="o.number"/></td>
                             <td><strong>Bank Account</strong></td>
+                            <td><span t-field="o.employee_id.otherid"/></td>
                         </tr>
                         <tr>
                             <td><strong>Date From</strong></td>