From 1289bbc5b0833cf8625fb994fe49255b8877eb10 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 6 Oct 2020 12:14:49 -0700 Subject: [PATCH] [IMP] hr_payroll_timesheet: require `hr_timesheet_work_type` and use the timesheet's specififed work entry type --- hr_payroll_timesheet/__init__.py | 8 +-- hr_payroll_timesheet/__manifest__.py | 5 +- .../data/hr_payroll_timesheet_data.xml | 5 +- .../data/hr_payroll_timesheet_demo.xml | 10 ++++ hr_payroll_timesheet/models/hr_payslip.py | 20 ++++--- .../tests/test_payslip_timesheet.py | 56 +++++++++++++++++++ 6 files changed, 87 insertions(+), 17 deletions(-) create mode 100644 hr_payroll_timesheet/data/hr_payroll_timesheet_demo.xml diff --git a/hr_payroll_timesheet/__init__.py b/hr_payroll_timesheet/__init__.py index a16151af..90502662 100644 --- a/hr_payroll_timesheet/__init__.py +++ b/hr_payroll_timesheet/__init__.py @@ -3,16 +3,12 @@ from . import models def ts_payroll_pre_init_hook(cr): """ - This module installs a Work Entry Type with code "TS" + This module installs a Work Entry Type with code "TS_OT" If you have undergone a migration (either for this module - or even your own Payslip Work Entry lines with code "TS") + or even your own Payslip Work Entry lines with code "TS_OT") then the uniqueness constraint will prevent this module from installing. """ - cr.execute("UPDATE hr_work_entry_type " - "SET code = 'TS-PRE-INSTALL' " - "WHERE code = 'TS';" - ) cr.execute("UPDATE hr_work_entry_type " "SET code = 'TS_OT-PRE-INSTALL' " "WHERE code = 'TS_OT';" diff --git a/hr_payroll_timesheet/__manifest__.py b/hr_payroll_timesheet/__manifest__.py index cb8baa6f..947bf38d 100755 --- a/hr_payroll_timesheet/__manifest__.py +++ b/hr_payroll_timesheet/__manifest__.py @@ -11,9 +11,12 @@ 'views/hr_contract_view.xml', 'views/hr_payslip_views.xml', ], + 'demo': [ + 'data/hr_payroll_timesheet_demo.xml', + ], 'depends': [ 'hr_payroll', - 'hr_timesheet', + 'hr_timesheet_work_entry', 'hr_payroll_overtime', ], 'pre_init_hook': 'ts_payroll_pre_init_hook', diff --git a/hr_payroll_timesheet/data/hr_payroll_timesheet_data.xml b/hr_payroll_timesheet/data/hr_payroll_timesheet_data.xml index eb684a08..69ae14c0 100644 --- a/hr_payroll_timesheet/data/hr_payroll_timesheet_data.xml +++ b/hr_payroll_timesheet/data/hr_payroll_timesheet_data.xml @@ -6,9 +6,8 @@ Timesheet Overtime TS_OT - - Timesheet - TS + + diff --git a/hr_payroll_timesheet/data/hr_payroll_timesheet_demo.xml b/hr_payroll_timesheet/data/hr_payroll_timesheet_demo.xml new file mode 100644 index 00000000..af096c6b --- /dev/null +++ b/hr_payroll_timesheet/data/hr_payroll_timesheet_demo.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/hr_payroll_timesheet/models/hr_payslip.py b/hr_payroll_timesheet/models/hr_payslip.py index a263a168..218d6e8a 100644 --- a/hr_payroll_timesheet/models/hr_payslip.py +++ b/hr_payroll_timesheet/models/hr_payslip.py @@ -28,7 +28,7 @@ class HrPayslip(models.Model): """ if not self.contract_id.paid_hourly_timesheet: return worked_day_lines - if not self.state == 'draft': + if not self.state in ('draft', 'verify'): return worked_day_lines timesheet_to_keep = self.timesheet_ids.filtered(lambda ts: ts.employee_id == self.employee_id @@ -40,17 +40,20 @@ class HrPayslip(models.Model): ]) self.update({'timesheet_ids': [(6, 0, timesheet_to_keep.ids)]}) - timesheet_type = self.env.ref('hr_payroll_timesheet.work_input_timesheet', raise_if_not_found=False) + timesheet_type = self.env.ref('hr_tiemsheet_work_entry.work_input_timesheet', raise_if_not_found=False) if not timesheet_type: - # return early, include the "work calendar lines" - return worked_day_lines + # different default type + timesheet_type = self.struct_id.type_id.default_work_entry_type_id + if not timesheet_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) if original_work_type: # 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] - work_data = self._pre_aggregate_timesheet_data() + work_data = self._pre_aggregate_timesheet_data(timesheet_type) processed_data = self.aggregate_overtime(work_data) worked_day_lines += [{ @@ -67,12 +70,15 @@ class HrPayslip(models.Model): # Override if you pay differently for different work types return self.contract_id.wage - def _pre_aggregate_timesheet_data(self): - timesheet_type = self.env.ref('hr_payroll_timesheet.work_input_timesheet', raise_if_not_found=False) + def _pre_aggregate_timesheet_data(self, default_workentrytype): worked_ts = defaultdict(list) for ts in self.timesheet_ids.sorted('id'): if ts.unit_amount: ts_iso = ts.date.isocalendar() + timesheet_type = ts.work_type_id or default_workentrytype + if timesheet_type in self.struct_id.unpaid_work_entry_type_ids: + # this is unpaid, so we have to skip it from aggregation + continue worked_ts[ts_iso].append((timesheet_type, ts.unit_amount, ts)) res = [(k, worked_ts[k]) for k in sorted(worked_ts.keys())] return res diff --git a/hr_payroll_timesheet/tests/test_payslip_timesheet.py b/hr_payroll_timesheet/tests/test_payslip_timesheet.py index 416ab852..8e86f75a 100644 --- a/hr_payroll_timesheet/tests/test_payslip_timesheet.py +++ b/hr_payroll_timesheet/tests/test_payslip_timesheet.py @@ -125,3 +125,59 @@ class TestPayslipTimesheet(common.TransactionCase): self.assertTrue(timesheet_overtime_line) self.assertEqual(timesheet_overtime_line.number_of_days, 1.0) self.assertEqual(timesheet_overtime_line.number_of_hours, 12.0) + + def test_payslip_timesheet_specific_work_entry_type(self): + self.assertTrue(self.contract.paid_hourly_timesheet) + worktype = self.env.ref('hr_timesheet_work_entry.work_input_timesheet_internal') + + # Day 1 + self.env['account.analytic.line'].create({ + 'employee_id': self.employee.id, + 'project_id': self.project.id, + 'date': '2018-01-01', + 'unit_amount': 5.0, + 'name': 'test', + }) + self.env['account.analytic.line'].create({ + 'employee_id': self.employee.id, + 'project_id': self.project.id, + 'date': '2018-01-01', + 'unit_amount': 3.0, + 'name': 'test', + }) + + # Day 2 + self.env['account.analytic.line'].create({ + 'employee_id': self.employee.id, + 'project_id': self.project.id, + 'date': '2018-01-02', + 'unit_amount': 10.0, + 'name': 'test', + 'work_type_id': worktype.id, + }) + + # Make one that should be excluded. + self.env['account.analytic.line'].create({ + 'employee_id': self.employee.id, + 'project_id': self.project.id, + 'date': '2017-01-01', + 'unit_amount': 5.0, + 'name': 'test', + 'payslip_id': self.payslip_dummy.id, + }) + + self.payslip._onchange_employee() + self.assertTrue(self.payslip.contract_id, 'No auto-discovered contract!') + wage = self.test_hourly_wage + self.payslip.compute_sheet() + self.assertTrue(self.payslip.worked_days_line_ids) + + timesheet_line = self.payslip.worked_days_line_ids.filtered(lambda l: l.code == 'TS') + self.assertTrue(timesheet_line) + self.assertEqual(timesheet_line.number_of_days, 1.0) + self.assertEqual(timesheet_line.number_of_hours, 8.0) + + worktype_line = self.payslip.worked_days_line_ids.filtered(lambda l: l.code == worktype.code) + self.assertTrue(worktype_line) + self.assertEqual(worktype_line.number_of_days, 1.0) + self.assertEqual(worktype_line.number_of_hours, 10.0)