Merge branch 'mig/13.0/hr_payroll_timesheet' into '13.0-test'

mig/13.0/hr_payroll_timesheet into 13.0-test

See merge request hibou-io/hibou-odoo/suite!419
This commit is contained in:
Hibou Bot
2020-07-16 20:28:37 +00:00

View File

@@ -33,7 +33,7 @@ class HrPayslip(models.Model):
timesheet_to_keep = self.timesheet_ids.filtered(lambda ts: ts.employee_id == self.employee_id
and ts.date <= self.date_to)
timesheet_to_keep += self.env['account.analytic.line'].search([
timesheet_to_keep |= self.env['account.analytic.line'].search([
('employee_id', '=', self.employee_id.id),
('date', '<=', self.date_to),
('payslip_id', '=', False),