audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
mig/13.0/hr_payroll_attendance into 13.0-test

See merge request hibou-io/hibou-odoo/suite!408
This commit is contained in:
Hibou Bot
2020-07-07 22:03:23 +00:00
parent 4a0dd937fe e2ee16c058
commit a6a5c9f95f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hr_payroll_attendance/models/hr_payslip.py
View File

@@ -50,10 +50,10 @@ class HrPayslip(models.Model):
work_data = self._pre_aggregate_attendance_data()
processed_data = self.aggregate_overtime(work_data)
# TODO is it appropriate to remove all lines? Ideally we would only remove the old type.
lines_to_keep = self.worked_days_line_ids.filtered(lambda x: x.work_entry_type_id not in types_to_remove)
work_lines_vals = [(5, 0, 0)] + [(4, line.id, False) for line in lines_to_keep]
# work_lines_vals = [(5, 0, 0)]
# Note that [(5, 0, 0)] + [(4, 999, 0)], will not work
work_lines_vals = [(3, line.id, False) for line in (self.worked_days_line_ids - lines_to_keep)]
work_lines_vals += [(4, line.id, False) for line in lines_to_keep]
work_lines_vals += [(0, 0, {
'number_of_days': data[0],
'number_of_hours': data[1],