diff --git a/addons/hr_attendance/models/hr_employee.py b/addons/hr_attendance/models/hr_employee.py index 8d12a17fbde..026d9dd4df2 100644 --- a/addons/hr_attendance/models/hr_employee.py +++ b/addons/hr_attendance/models/hr_employee.py @@ -20,8 +20,8 @@ class HrEmployee(models.Model): barcode = "".join(choice(digits) for i in range(8)) return barcode - barcode = fields.Char(string="Badge ID", help="ID used for employee identification.", default=_default_random_barcode, copy=False, groups='hr.group_hr_user') - pin = fields.Char(string="PIN", default=_default_random_pin, help="PIN used for Check In/Out in Attendance.", copy=False, groups='hr.group_hr_user') + barcode = fields.Char(string="Badge ID", help="ID used for employee identification.", default=_default_random_barcode, copy=False, groups='hr_attendance.group_hr_attendance_user') + pin = fields.Char(string="PIN", default=_default_random_pin, help="PIN used for Check In/Out in Attendance.", copy=False, groups='hr_attendance.group_hr_attendance_user') attendance_ids = fields.One2many('hr.attendance', 'employee_id', help='list of attendances for the employee') last_attendance_id = fields.Many2one('hr.attendance', compute='_compute_last_attendance_id') diff --git a/addons/hr_attendance/security/hr_attendance_security.xml b/addons/hr_attendance/security/hr_attendance_security.xml index 742722d2fa2..559df28e799 100644 --- a/addons/hr_attendance/security/hr_attendance_security.xml +++ b/addons/hr_attendance/security/hr_attendance_security.xml @@ -1,11 +1,28 @@ - + + Officer + + + + + + Manager + + + + + + + + + + - + @@ -26,7 +43,7 @@ attendance officer: full access [(1,'=',1)] - + diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv index 080245b84fb..ca57b0fd50a 100644 --- a/addons/hr_attendance/security/ir.model.access.csv +++ b/addons/hr_attendance/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_hr_attendance_user,hr.attendance.user,model_hr_attendance,hr.group_hr_user,1,1,1,1 +access_hr_attendance_user,hr.attendance.user,model_hr_attendance,hr_attendance.group_hr_attendance_user,1,1,1,1 access_hr_attendance_system_user,hr.attendance.system.user,model_hr_attendance,base.group_user,1,1,1,0 \ No newline at end of file diff --git a/addons/hr_attendance/static/src/js/message.js b/addons/hr_attendance/static/src/js/message.js index 65395c6da96..20cb767692f 100644 --- a/addons/hr_attendance/static/src/js/message.js +++ b/addons/hr_attendance/static/src/js/message.js @@ -20,7 +20,7 @@ var Message = Widget.extend({ var self = this; var default_action = { type: "ir.actions.client", name: 'Attendances', tag: 'hr_attendance_my_main_menu', params: {} }; if(!action.attendance){ - self.session.user_has_group('hr.group_hr_user').then(function(has_group){ + self.session.user_has_group('hr_attendance.group_hr_attendance_user').then(function(has_group){ if(has_group){ self.next_action = { type: "ir.actions.client", name: 'Attendances', tag: 'hr_attendance_main_menu', target: 'fullscreen', params: {} }; } diff --git a/addons/hr_attendance/views/hr_attendance_view.xml b/addons/hr_attendance/views/hr_attendance_view.xml index 744695f4a5e..3555b415080 100644 --- a/addons/hr_attendance/views/hr_attendance_view.xml +++ b/addons/hr_attendance/views/hr_attendance_view.xml @@ -132,13 +132,13 @@ - + - + - + - + - + diff --git a/addons/hr_attendance/views/hr_department_view.xml b/addons/hr_attendance/views/hr_department_view.xml index f4228d25636..3c573b19bd3 100644 --- a/addons/hr_attendance/views/hr_department_view.xml +++ b/addons/hr_attendance/views/hr_department_view.xml @@ -5,6 +5,7 @@ hr.department.kanban.inherit hr.department + diff --git a/addons/hr_attendance/views/hr_employee_view.xml b/addons/hr_attendance/views/hr_employee_view.xml index fcf7eb295d1..12e82a5fa7a 100644 --- a/addons/hr_attendance/views/hr_employee_view.xml +++ b/addons/hr_attendance/views/hr_employee_view.xml @@ -13,9 +13,9 @@ - - - + + + diff --git a/addons/hr_attendance/views/res_config_view.xml b/addons/hr_attendance/views/res_config_view.xml index 5ec645ad584..9e1b9b5ef4c 100644 --- a/addons/hr_attendance/views/res_config_view.xml +++ b/addons/hr_attendance/views/res_config_view.xml @@ -26,5 +26,5 @@ + sequence="99" action="action_hr_attendance_settings" groups="hr_attendance.group_hr_attendance_manager"/> \ No newline at end of file diff --git a/addons/hr_expense/__manifest__.py b/addons/hr_expense/__manifest__.py index 35d5ec496ec..f9211554e29 100644 --- a/addons/hr_expense/__manifest__.py +++ b/addons/hr_expense/__manifest__.py @@ -28,6 +28,7 @@ This module also uses analytic accounting and is compatible with the invoice on 'website': 'https://www.odoo.com/page/expenses', 'depends': ['hr_contract', 'account_accountant', 'report', 'web_tour'], 'data': [ + 'security/hr_expense_security.xml', 'security/ir.model.access.csv', 'data/hr_expense_data.xml', 'data/hr_expense_sequence.xml', diff --git a/addons/hr_expense/security/hr_expense_security.xml b/addons/hr_expense/security/hr_expense_security.xml new file mode 100644 index 00000000000..71a393efaed --- /dev/null +++ b/addons/hr_expense/security/hr_expense_security.xml @@ -0,0 +1,19 @@ + + + + Officer + + + + + + Manager + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv index 6ded19e6c78..0eea145a6d4 100644 --- a/addons/hr_expense/security/ir.model.access.csv +++ b/addons/hr_expense/security/ir.model.access.csv @@ -1,17 +1,17 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_hr_expense_user,hr.expense.user,model_hr_expense,hr.group_hr_user,1,1,1,1 +access_hr_expense_user,hr.expense.user,model_hr_expense,hr_expense.group_hr_expense_user,1,1,1,1 access_hr_expense_employee,hr.expense.employee,model_hr_expense,base.group_user,1,1,1,1 -access_hr_expense_sheet_user,hr.expense.sheet.user,model_hr_expense_sheet,hr.group_hr_user,1,1,1,1 +access_hr_expense_sheet_user,hr.expense.sheet.user,model_hr_expense_sheet,hr_expense.group_hr_expense_user,1,1,1,1 access_hr_expense_sheet_employee,hr.expense.sheet.employee,model_hr_expense_sheet,base.group_user,1,1,1,1 -access_product_product_hr_expense_user,product.product.hr.expense.user,product.model_product_product,hr.group_hr_user,1,1,1,1 -access_product_template_hr_expense_user,product.template.hr.expense.user,product.model_product_template,hr.group_hr_user,1,1,1,1 -access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,hr.group_hr_user,1,1,1,1 -access_account_journal_user,account.journal.user,account.model_account_journal,hr.group_hr_user,1,1,1,1 +access_product_product_hr_expense_user,product.product.hr.expense.user,product.model_product_product,hr_expense.group_hr_expense_user,1,1,1,1 +access_product_template_hr_expense_user,product.template.hr.expense.user,product.model_product_template,hr_expense.group_hr_expense_user,1,1,1,1 +access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,hr_expense.group_hr_expense_user,1,1,1,1 +access_account_journal_user,account.journal.user,account.model_account_journal,hr_expense.group_hr_expense_user,1,1,1,1 access_account_journal_employee,account.journal.employee,account.model_account_journal,base.group_user,1,0,0,0 -access_account_invoice_user,account.invoice.user,account.model_account_invoice,hr.group_hr_user,1,1,1,1 -access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,hr.group_hr_user,1,1,1,1 -access_account_invoice_tax_user,account.invoice.tax.user,account.model_account_invoice_tax,hr.group_hr_user,1,0,0,0 -access_account_move_user,account.move.user,account.model_account_move,hr.group_hr_user,1,0,0,0 -access_account_move_line_user,account.move.line.user,account.model_account_move_line,hr.group_hr_user,1,0,0,0 -access_account_analytic_line_user,account.analytic.line.user,account.model_account_analytic_line,hr.group_hr_user,1,1,1,1 +access_account_invoice_user,account.invoice.user,account.model_account_invoice,hr_expense.group_hr_expense_user,1,1,1,1 +access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,hr_expense.group_hr_expense_user,1,1,1,1 +access_account_invoice_tax_user,account.invoice.tax.user,account.model_account_invoice_tax,hr_expense.group_hr_expense_user,1,0,0,0 +access_account_move_user,account.move.user,account.model_account_move,hr_expense.group_hr_expense_user,1,0,0,0 +access_account_move_line_user,account.move.line.user,account.model_account_move_line,hr_expense.group_hr_expense_user,1,0,0,0 +access_account_analytic_line_user,account.analytic.line.user,account.model_account_analytic_line,hr_expense.group_hr_expense_user,1,1,1,1 diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml index 01492f7d00a..e084a2b9283 100644 --- a/addons/hr_expense/security/ir_rule.xml +++ b/addons/hr_expense/security/ir_rule.xml @@ -6,7 +6,7 @@ Manager Expense [(1, '=', 1)] - + Employee Expense diff --git a/addons/hr_expense/views/hr_dashboard.xml b/addons/hr_expense/views/hr_dashboard.xml index 26d049bfd62..e9e9a67a8bd 100644 --- a/addons/hr_expense/views/hr_dashboard.xml +++ b/addons/hr_expense/views/hr_dashboard.xml @@ -4,6 +4,7 @@ hr.department.kanban.inherit hr.department + diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml index 08f21f8ec9a..71c348e07a6 100644 --- a/addons/hr_expense/views/hr_expense_views.xml +++ b/addons/hr_expense/views/hr_expense_views.xml @@ -166,7 +166,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -406,11 +406,11 @@
-
@@ -549,7 +549,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -748,23 +748,23 @@ - + - + - + + action="action_hr_expense_sheet_all_all" groups="hr_expense.group_hr_expense_manager"/> + action="hr_expense_product" groups="hr_expense.group_hr_expense_manager" sequence="10"/> diff --git a/addons/hr_gamification/__manifest__.py b/addons/hr_gamification/__manifest__.py index 05edc83f70a..b0173de4d44 100644 --- a/addons/hr_gamification/__manifest__.py +++ b/addons/hr_gamification/__manifest__.py @@ -13,8 +13,8 @@ This allow the user to send badges to employees instead of simple users. Badge received are displayed on the user profile. """, 'data': [ - 'security/ir.model.access.csv', 'security/gamification_security.xml', + 'security/ir.model.access.csv', 'wizard/gamification_badge_user_wizard_views.xml', 'views/gamification_views.xml', 'views/hr_employee_views.xml', diff --git a/addons/hr_gamification/security/ir.model.access.csv b/addons/hr_gamification/security/ir.model.access.csv index 3cbe77aa6fa..9ace96f7139 100644 --- a/addons/hr_gamification/security/ir.model.access.csv +++ b/addons/hr_gamification/security/ir.model.access.csv @@ -2,4 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink challenge_officer,"Challenge Officer",gamification.model_gamification_challenge,hr.group_hr_user,1,1,1,1 challenge_line_officer,"Challenge Line Officer",gamification.model_gamification_challenge_line,hr.group_hr_user,1,1,1,1 badge_officer,"Badge Officer",gamification.model_gamification_badge,hr.group_hr_user,1,1,1,1 -badge_user_officer,"Badge-user Officer",gamification.model_gamification_badge_user,hr.group_hr_user,1,1,1,1 \ No newline at end of file +badge_user_officer,"Badge-user Officer",gamification.model_gamification_badge_user,hr.group_hr_user,1,1,1,1 diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py index 834a5101f2a..5629bde4807 100644 --- a/addons/hr_holidays/__manifest__.py +++ b/addons/hr_holidays/__manifest__.py @@ -29,8 +29,8 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p 'data/report_paperformat.xml', 'data/hr_holidays_data.xml', - 'security/ir.model.access.csv', 'security/hr_holidays_security.xml', + 'security/ir.model.access.csv', 'views/resource_views.xml', 'views/hr_holidays_views.xml', diff --git a/addons/hr_holidays/models/hr.py b/addons/hr_holidays/models/hr.py index 9f79e35cc2a..fdec5c0ad5e 100644 --- a/addons/hr_holidays/models/hr.py +++ b/addons/hr_holidays/models/hr.py @@ -176,7 +176,7 @@ class Employee(models.Model): @api.multi def _compute_show_leaves(self): - show_leaves = self.env['res.users'].has_group('hr.group_hr_user') + show_leaves = self.env['res.users'].has_group('hr_holidays.group_hr_holidays_user') for employee in self: if show_leaves or employee.user_id == self.env.user: employee.show_leaves = True diff --git a/addons/hr_holidays/models/hr_holidays.py b/addons/hr_holidays/models/hr_holidays.py index 24b0b875d8f..f73d535a55d 100644 --- a/addons/hr_holidays/models/hr_holidays.py +++ b/addons/hr_holidays/models/hr_holidays.py @@ -224,7 +224,7 @@ class Holidays(models.Model): or if he is an Hr Manager. """ user = self.env.user - group_hr_manager = self.env.ref('hr.group_hr_manager') + group_hr_manager = self.env.ref('hr_holidays.group_hr_holidays_manager') for holiday in self: if group_hr_manager in user.groups_id or holiday.employee_id and holiday.employee_id.user_id == user: holiday.can_reset = True @@ -332,7 +332,7 @@ class Holidays(models.Model): return res def _check_state_access_right(self, vals): - if vals.get('state') and vals['state'] not in ['draft', 'confirm', 'cancel'] and not self.env['res.users'].has_group('hr.group_hr_user'): + if vals.get('state') and vals['state'] not in ['draft', 'confirm', 'cancel'] and not self.env['res.users'].has_group('hr_holidays.group_hr_holidays_user'): return False return True @@ -436,7 +436,7 @@ class Holidays(models.Model): def action_approve(self): # if double_validation: this method is the first approval approval # if not double_validation: this method calls action_validate() below - if not self.env.user.has_group('hr.group_hr_user'): + if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'): raise UserError(_('Only an HR Officer or Manager can approve leave requests.')) manager = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1) @@ -451,14 +451,14 @@ class Holidays(models.Model): @api.multi def action_validate(self): - if not self.env.user.has_group('hr.group_hr_user'): + if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'): raise UserError(_('Only an HR Officer or Manager can approve leave requests.')) manager = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1) for holiday in self: if holiday.state not in ['confirm', 'validate1']: raise UserError(_('Leave request must be confirmed in order to approve it.')) - if holiday.state == 'validate1' and not holiday.env.user.has_group('hr.group_hr_manager'): + if holiday.state == 'validate1' and not holiday.env.user.has_group('hr_holidays.group_hr_holidays_manager'): raise UserError(_('Only an HR Manager can apply the second approval on leave requests.')) holiday.write({'state': 'validate'}) @@ -510,7 +510,7 @@ class Holidays(models.Model): @api.multi def action_refuse(self): - if not self.env.user.has_group('hr.group_hr_user'): + if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'): raise UserError(_('Only an HR Officer or Manager can refuse leave requests.')) manager = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1) @@ -556,12 +556,12 @@ class Holidays(models.Model): recipients. Indeed those will have specific action in their notification emails. """ - group_hr_user = self.env.ref('hr.group_hr_user') + group_hr_holidays_user = self.env.ref('hr_holidays.group_hr_holidays_user') for recipient in recipients: if recipient.id in done_ids: continue - if recipient.user_ids and group_hr_user in recipient.user_ids[0].groups_id: - group_data['group_hr_user'] |= recipient + if recipient.user_ids and group_hr_holidays_user in recipient.user_ids[0].groups_id: + group_data['group_hr_holidays_user'] |= recipient done_ids.add(recipient.id) return super(Holidays, self)._notification_group_recipients(message, recipients, done_ids, group_data) @@ -578,7 +578,7 @@ class Holidays(models.Model): if self.state in ['confirm', 'validate', 'validate1']: actions.append({'url': ref_action, 'title': 'Refuse'}) - result['group_hr_user'] = { + result['group_hr_holidays_user'] = { 'actions': actions } return result diff --git a/addons/hr_holidays/security/hr_holidays_security.xml b/addons/hr_holidays/security/hr_holidays_security.xml index fb6041db7fe..1ab627ff22e 100644 --- a/addons/hr_holidays/security/hr_holidays_security.xml +++ b/addons/hr_holidays/security/hr_holidays_security.xml @@ -1,5 +1,22 @@ + + Officer + + + + + + Manager + + + + + + + + + Employee Holidays @@ -22,14 +39,14 @@ Holidays Officer [(1,'=',1)] - + Leaves Officer [(1,'=',1)] - + diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv index cf7e7b24bed..56b3305aa91 100644 --- a/addons/hr_holidays/security/ir.model.access.csv +++ b/addons/hr_holidays/security/ir.model.access.csv @@ -1,10 +1,10 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_hr_holidays_user,hr.holidays.user,model_hr_holidays,hr.group_hr_user,1,1,1,1 +access_hr_holidays_user,hr.holidays.user,model_hr_holidays,hr_holidays.group_hr_holidays_user,1,1,1,1 access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_user,1,1,1,1 access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,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_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,hr.group_hr_user,1,1,1,1 -access_resource_calendar_leaves_user,resource_calendar_leaves_user,resource.model_resource_calendar_leaves,hr.group_hr_user,1,1,1,1 -access_calendar_event_hr_user,calendar.event.hr.user,calendar.model_calendar_event,hr.group_hr_user,1,1,1,1 -access_calendar_event_type_manager,calendar.event.type.manager,calendar.model_calendar_event_type,hr.group_hr_manager,1,1,1,1 -access_calendar_attendee_hr_user,calendar.attendee.hr.user,calendar.model_calendar_attendee,hr.group_hr_user,1,1,1,1 +access_hr_holydays_status_manager,hr.holidays.status manager,model_hr_holidays_status,hr_holidays.group_hr_holidays_manager,1,1,1,1 +access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,hr_holidays.group_hr_holidays_user,1,1,1,1 +access_resource_calendar_leaves_user,resource_calendar_leaves_user,resource.model_resource_calendar_leaves,hr_holidays.group_hr_holidays_user,1,1,1,1 +access_calendar_event_hr_user,calendar.event.hr.user,calendar.model_calendar_event,hr_holidays.group_hr_holidays_user,1,1,1,1 +access_calendar_event_type_manager,calendar.event.type.manager,calendar.model_calendar_event_type,hr_holidays.group_hr_holidays_manager,1,1,1,1 +access_calendar_attendee_hr_user,calendar.attendee.hr.user,calendar.model_calendar_attendee,hr_holidays.group_hr_holidays_user,1,1,1,1 diff --git a/addons/hr_holidays/tests/common.py b/addons/hr_holidays/tests/common.py index 40ec4e850b3..85dff9ba5ff 100644 --- a/addons/hr_holidays/tests/common.py +++ b/addons/hr_holidays/tests/common.py @@ -19,13 +19,13 @@ class TestHrHolidaysBase(common.TransactionCase): 'name': 'Armande HrUser', 'login': 'Armande', 'email': 'armande.hruser@example.com', - 'groups_id': [(6, 0, [group_employee_id, self.ref('hr.group_hr_user')])] + 'groups_id': [(6, 0, [group_employee_id, self.ref('hr_holidays.group_hr_holidays_user')])] }).id self.user_hrmanager_id = Users.create({ 'name': 'Bastien HrManager', 'login': 'bastien', 'email': 'bastien.hrmanager@example.com', - 'groups_id': [(6, 0, [group_employee_id, self.ref('hr.group_hr_manager')])] + 'groups_id': [(6, 0, [group_employee_id, self.ref('hr_holidays.group_hr_holidays_manager')])] }).id self.user_employee_id = Users.create({ 'name': 'David Employee', diff --git a/addons/hr_holidays/views/hr_holidays_views.xml b/addons/hr_holidays/views/hr_holidays_views.xml index 4bd0cba4722..9e606dfaa4d 100644 --- a/addons/hr_holidays/views/hr_holidays_views.xml +++ b/addons/hr_holidays/views/hr_holidays_views.xml @@ -29,9 +29,9 @@ - + - + @@ -83,9 +83,9 @@
@@ -190,7 +190,7 @@ + sequence="11" groups="hr_timesheet.group_hr_timesheet_user"/> hr.department.kanban.inherit hr.department + diff --git a/addons/l10n_in_hr_payroll/security/ir.model.access.csv b/addons/l10n_in_hr_payroll/security/ir.model.access.csv index dcebadc2209..4d3beb49f09 100644 --- a/addons/l10n_in_hr_payroll/security/ir.model.access.csv +++ b/addons/l10n_in_hr_payroll/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_payroll_advice_user","hr.payroll.advice","model_hr_payroll_advice","hr.group_hr_user",1,1,1,1 -"access_hr_payroll_advice_line_user","hr.payroll.advice.line","model_hr_payroll_advice_line","hr.group_hr_user",1,1,1,1 -"access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","hr.group_hr_manager",1,1,1,1 -"access_hr_payroll_payslip_report_user","payslip.report","model_payslip_report","hr.group_hr_manager",1,1,1,1 +"access_hr_payroll_advice_user","hr.payroll.advice","model_hr_payroll_advice","hr_payroll.group_hr_payroll_user",1,1,1,1 +"access_hr_payroll_advice_line_user","hr.payroll.advice.line","model_hr_payroll_advice_line","hr_payroll.group_hr_payroll_user",1,1,1,1 +"access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","hr_payroll.group_hr_payroll_manager",1,1,1,1 +"access_hr_payroll_payslip_report_user","payslip.report","model_payslip_report","hr_payroll.group_hr_payroll_manager",1,1,1,1 diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml index 0f76c4eb198..3de7c0d4ebb 100644 --- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml +++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml @@ -36,6 +36,6 @@ sequence="200" action="action_salary_employee_month" id="menu_salary_employee_month" - groups="hr.group_hr_manager,hr.group_hr_user" + groups="hr_payroll.group_hr_payroll_manager,hr_payroll.group_hr_payroll_user" /> diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml index 3f52d40269e..1b9b3fb0eab 100644 --- a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml +++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml @@ -35,6 +35,6 @@ action="action_yearly_salary_detail" sequence="250" id="menu_yearly_salary_detail" - groups="hr.group_hr_manager,hr.group_hr_user" + groups="hr_payroll.group_hr_payroll_manager,hr_payroll.group_hr_payroll_user" /> diff --git a/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml b/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml index c3e6a4054e7..0fb6adfcd20 100644 --- a/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml +++ b/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml @@ -25,7 +25,7 @@ Job Positions: HR Officer [(1, '=', 1)] - + diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml index c0b81298788..a582d0f89ee 100644 --- a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml +++ b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml @@ -40,7 +40,7 @@

Contact us for job opportunities.

-

+

Create new job pages from the +New top-right button.

@@ -467,7 +467,7 @@ diff --git a/odoo/addons/base/module/module_data.xml b/odoo/addons/base/module/module_data.xml index 92b023b8372..51b3f3d5a9a 100644 --- a/odoo/addons/base/module/module_data.xml +++ b/odoo/addons/base/module/module_data.xml @@ -67,20 +67,68 @@ - Human Resources - Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more. + Employees + Helps you manage your employees. 9 + + Holidays + Helps you manage your holidays. + 10 + + + + Recruitment + Helps you manage your recruitments. + 11 + + + + Expenses + Helps you manage your expenses. + 12 + + + + Timesheets + Helps you manage the timesheets. + 13 + + + + Attendance + Helps you manage the attendances. + 14 + + + + Appraisals + Helps you manage your appraisals. + 15 + + + + Payroll + Helps you manage your payrolls. + 16 + + + + Gamification + Helps you manage the gamification process. + 17 + + Events Helps you manage your Events. - 10 + 18 Mass Mailing - 11 + 19 Helps you manage your mass mailing for design professional emails and reuse templates. @@ -88,28 +136,28 @@ Survey Helps you manage your survey for review of different-different users. - 12 + 20 Point of Sale Helps you get the most out of your points of sales with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more. - 13 + 21 Specific Industry Applications - 14 + 22 Website - 15 + 23 Theme - 16 + 50