diff --git a/addons/hr_payroll/models/hr_benefit.py b/addons/hr_payroll/models/hr_benefit.py index 03543496b7b..bafe3fd7414 100644 --- a/addons/hr_payroll/models/hr_benefit.py +++ b/addons/hr_payroll/models/hr_benefit.py @@ -33,6 +33,8 @@ class HrBenefit(models.Model): ], default='draft') display_warning = fields.Boolean(string="Error") leave_id = fields.Many2one('hr.leave', string='Leave') + company_id = fields.Many2one('res.company', string='Company', readonly=True, required=True, + default=lambda self: self.env['res.company']._company_default_get()) _sql_constraints = [ ('_unique', 'unique (employee_id, date_start, date_stop, benefit_type_id)', "Benefit already exists for this attendence"), diff --git a/addons/hr_payroll/models/hr_payslip.py b/addons/hr_payroll/models/hr_payslip.py index de7ce63761e..c3f625e618c 100644 --- a/addons/hr_payroll/models/hr_payslip.py +++ b/addons/hr_payroll/models/hr_payslip.py @@ -270,7 +270,7 @@ class HrPayslip(models.Model): employee = self.employee_id date_from = self.date_from date_to = self.date_to - + self.company_id = employee.company_id if not self.contract_id: # Add a default contract if not already defined @@ -410,6 +410,8 @@ class HrPayslipRun(models.Model): states={'draft': [('readonly', False)]}, help="If its checked, indicates that all payslips generated from here are refund payslips.") payslip_count = fields.Integer(compute='_compute_payslip_count') + company_id = fields.Many2one('res.company', string='Company', readonly=True, required=True, + default=lambda self: self.env['res.company']._company_default_get()) def _compute_payslip_count(self): for payslip_run in self: diff --git a/addons/hr_payroll/security/hr_payroll_security.xml b/addons/hr_payroll/security/hr_payroll_security.xml index e666a36cb80..baba9e4f4b9 100644 --- a/addons/hr_payroll/security/hr_payroll_security.xml +++ b/addons/hr_payroll/security/hr_payroll_security.xml @@ -69,5 +69,19 @@ ['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])] + + HR Payslip: Multi Company + + + ['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])] + + + + HR Payslip: Multi Company + + + ['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])] + +