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

[IMP] hr_payroll_attendance: new default entry mechanisms, otherwise use the type from the attendance

Browse Source 
Also skip putting it on the sheet if it is an unpaid type.
This commit is contained in:
Jared Kipe
2020-10-05 16:48:54 -07:00
parent e5ef236631
commit ffee220f25
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
hr_payroll_attendance/models/hr_payslip.py
View File

@@ -28,7 +28,7 @@ class HrPayslip(models.Model):
""" """
if not self.contract_id.paid_hourly_attendance: if not self.contract_id.paid_hourly_attendance:
return worked_day_lines return worked_day_lines
if not self.state == 'draft': if not self.state in ('draft', 'verify'):
return worked_day_lines return worked_day_lines
attendance_to_keep = self.attendance_ids.filtered(lambda a: a.employee_id == self.employee_id attendance_to_keep = self.attendance_ids.filtered(lambda a: a.employee_id == self.employee_id
@@ -40,17 +40,20 @@ class HrPayslip(models.Model):
]) ])
self.update({'attendance_ids': [(6, 0, attendance_to_keep.ids)]}) self.update({'attendance_ids': [(6, 0, attendance_to_keep.ids)]})
attendance_type = self.env.ref('hr_payroll_attendance.work_input_attendance', raise_if_not_found=False) attendance_type = self.env.ref('hr_attendance_work_entry.work_input_attendance', raise_if_not_found=False)
if not attendance_type: if not attendance_type:
# return early, include the "work calendar lines" # different default type
return worked_day_lines attendance_type = self.struct_id.type_id.default_work_entry_type_id
if not attendance_type:
# return early, include the "work calendar lines"
return worked_day_lines
original_work_type = self.env.ref('hr_work_entry.work_entry_type_attendance', raise_if_not_found=False) original_work_type = self.env.ref('hr_work_entry.work_entry_type_attendance', raise_if_not_found=False)
if original_work_type: if original_work_type:
# filter out "work calendar lines" # filter out "work calendar lines"
worked_day_lines = [w for w in worked_day_lines if w['work_entry_type_id'] != original_work_type.id] worked_day_lines = [w for w in worked_day_lines if w['work_entry_type_id'] != original_work_type.id]
work_data = self._pre_aggregate_attendance_data() work_data = self._pre_aggregate_attendance_data(attendance_type)
processed_data = self.aggregate_overtime(work_data) processed_data = self.aggregate_overtime(work_data)
worked_day_lines += [{ worked_day_lines += [{
@@ -67,13 +70,16 @@ class HrPayslip(models.Model):
# Override if you pay differently for different work types # Override if you pay differently for different work types
return self.contract_id.wage return self.contract_id.wage
def _pre_aggregate_attendance_data(self): def _pre_aggregate_attendance_data(self, default_workentrytype):
attendance_type = self.env.ref('hr_payroll_attendance.work_input_attendance', raise_if_not_found=False)
worked_attn = defaultdict(list) worked_attn = defaultdict(list)
for attn in self.attendance_ids: for attn in self.attendance_ids:
if attn.worked_hours: if attn.worked_hours:
# Avoid in/outs # Avoid in/outs
attn_iso = attn.check_in.isocalendar() attn_iso = attn.check_in.isocalendar()
attendance_type = attn.work_type_id or default_workentrytype
if attendance_type in self.struct_id.unpaid_work_entry_type_ids:
# this is unpaid, so we have to skip it from aggregation
continue
worked_attn[attn_iso].append((attendance_type, attn.worked_hours, attn)) worked_attn[attn_iso].append((attendance_type, attn.worked_hours, attn))
res = [(k, worked_attn[k]) for k in sorted(worked_attn.keys())] res = [(k, worked_attn[k]) for k in sorted(worked_attn.keys())]
return res return res