diff --git a/hr_payroll_timesheet/__manifest__.py b/hr_payroll_timesheet/__manifest__.py index 8adbd81b..ccd1c658 100755 --- a/hr_payroll_timesheet/__manifest__.py +++ b/hr_payroll_timesheet/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Timesheets on Payslips', 'description': 'Get Timesheet hours onto Employee Payslips.', - 'version': '13.0.1.0.1', + 'version': '14.0.1.0.0', 'website': 'https://hibou.io/', 'author': 'Hibou Corp. ', 'license': 'OPL-1', @@ -12,12 +12,13 @@ 'data/hr_payroll_timesheet_data.xml', 'views/hr_contract_view.xml', 'views/hr_payslip_views.xml', + 'views/timesheet_views.xml', ], 'demo': [ 'data/hr_payroll_timesheet_demo.xml', ], 'depends': [ - 'hr_payroll', + 'hr_payroll_hibou', 'hr_timesheet_work_entry', 'hr_payroll_overtime', 'hibou_professional', diff --git a/hr_payroll_timesheet/migrations/13.0.0.0.1/pre-migration.py b/hr_payroll_timesheet/migrations/13.0.0.0.1/pre-migration.py deleted file mode 100644 index 85e132be..00000000 --- a/hr_payroll_timesheet/migrations/13.0.0.0.1/pre-migration.py +++ /dev/null @@ -1,7 +0,0 @@ -# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. - -def migrate(cr, version): - # pre_init_hook script only runs on install, - # if you're coming from 12.0 we need the same change - from odoo.addons.hr_payroll_timesheet import ts_payroll_pre_init_hook - ts_payroll_pre_init_hook(cr) diff --git a/hr_payroll_timesheet/models/account.py b/hr_payroll_timesheet/models/account.py index 249cdba3..246e76a5 100644 --- a/hr_payroll_timesheet/models/account.py +++ b/hr_payroll_timesheet/models/account.py @@ -1,12 +1,31 @@ # Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. -from odoo import fields, models +from odoo import api, fields, models +from odoo.exceptions import ValidationError class AnalyticLine(models.Model): _inherit = 'account.analytic.line' - payslip_id = fields.Many2one('hr.payslip', string="Payslip", readonly=True, ondelete='set null') + payslip_id = fields.Many2one('hr.payslip', string="Payslip", ondelete='set null') + + @api.model_create_multi + def create(self, vals_list): + if isinstance(vals_list, dict): + vals_list = [vals_list] + + payslips = self.env['hr.payslip'].sudo().browse([d.get('payslip_id', 0) for d in vals_list]) + if any(p.state not in ('draft', 'verify') for p in payslips.exists()): + raise ValidationError('Cannot create attendance linked to payslip that is not draft.') + return super().create(vals_list) + + def write(self, values): + payslip_id = values.get('payslip_id') + if payslip_id: + payslip = self.env['hr.payslip'].sudo().browse(payslip_id) + if payslip.exists().state not in ('draft', 'verify'): + raise ValidationError('Cannot modify attendance linked to payslip that is not draft.') + return super().write(values) def unlink(self): ts_with_payslip = self.filtered(lambda ts: ts.payslip_id) diff --git a/hr_payroll_timesheet/models/hr_contract.py b/hr_payroll_timesheet/models/hr_contract.py index 423b04ac..f9d7501d 100644 --- a/hr_payroll_timesheet/models/hr_contract.py +++ b/hr_payroll_timesheet/models/hr_contract.py @@ -1,9 +1,16 @@ # Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. -from odoo import fields, models +from odoo import api, fields, models class HrContract(models.Model): _inherit = 'hr.contract' paid_hourly_timesheet = fields.Boolean(string="Paid Hourly Timesheet", default=False) + + @api.onchange('paid_hourly_timesheet') + def _onchange_paid_hourly_timesheet(self): + for contract in self: + if contract.paid_hourly_timesheet: + # only allow switch, not automatic switch 'back' + contract.wage_type = 'hourly' diff --git a/hr_payroll_timesheet/models/hr_payslip.py b/hr_payroll_timesheet/models/hr_payslip.py index 8568cd43..c3b34b42 100644 --- a/hr_payroll_timesheet/models/hr_payslip.py +++ b/hr_payroll_timesheet/models/hr_payslip.py @@ -1,6 +1,5 @@ # Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. -from collections import defaultdict from odoo import api, fields, models, _ @@ -17,76 +16,38 @@ class HrPayslip(models.Model): for payslip in self: payslip.timesheet_count = len(payslip.timesheet_ids) - def _get_worked_day_lines(self): - # Called at the end of _onchange_employee() - worked_day_lines = super()._get_worked_day_lines() - return self._timesheet_get_worked_day_lines(worked_day_lines) + def _filter_worked_day_lines_values(self, worked_day_lines_values): + worked_day_lines_values = super()._filter_worked_day_lines_values(worked_day_lines_values) + if self.contract_id.paid_hourly_timesheet: + 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" + return [w for w in worked_day_lines_values if w['work_entry_type_id'] != original_work_type.id] + return worked_day_lines_values - def _timesheet_get_worked_day_lines(self, worked_day_lines): - """ - Filters out basic "Attendance"/"Work Calendar" entries as they would add to salary. - Note that this is during an onchange (probably). - :returns: a list of dict containing the worked days values that should be applied for the given payslip - """ - if not self.contract_id.paid_hourly_timesheet: - return worked_day_lines - if not self.state in ('draft', 'verify'): - return worked_day_lines + def _pre_aggregate_work_data(self): + work_data = super()._pre_aggregate_work_data() + if self.contract_id.paid_hourly_timesheet: + 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([ + ('employee_id', '=', self.employee_id.id), + ('date', '<=', self.date_to), + ('payslip_id', '=', False), + ]) + self.update({'timesheet_ids': [(6, 0, timesheet_to_keep.ids)]}) - 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([ - ('employee_id', '=', self.employee_id.id), - ('date', '<=', self.date_to), - ('payslip_id', '=', False), - ]) - self.update({'timesheet_ids': [(6, 0, timesheet_to_keep.ids)]}) - - timesheet_type = self.env.ref('hr_tiemsheet_work_entry.work_input_timesheet', raise_if_not_found=False) - if not timesheet_type: - # different default type - timesheet_type = self.struct_id.type_id.default_work_entry_type_id + timesheet_type = self.env.ref('hr_timesheet_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 work_data + work_data = self._pre_aggregate_timesheet_data(work_data, timesheet_type) + return work_data - 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] - - # normalize leaves - self._timesheet_normalize_other_work_lines(worked_day_lines) - - work_data = self._pre_aggregate_timesheet_data(timesheet_type) - processed_data = self.aggregate_overtime(work_data) - - worked_day_lines += [{ - 'number_of_days': data[0], - 'number_of_hours': data[1], - 'amount': data[1] * data[2] * self._wage_for_work_type(work_type), - 'contract_id': self.contract_id.id, - 'work_entry_type_id': work_type.id, - } for work_type, data in processed_data.items()] - - return worked_day_lines - - def _timesheet_normalize_other_work_lines(self, worked_day_line_values): - # Modifies the values based on 'wage' - unpaid_work_entry_types = self.struct_id.unpaid_work_entry_type_ids - for line_vals in worked_day_line_values: - work_type = self.env['hr.work.entry.type'].browse(line_vals['work_entry_type_id']) - if work_type not in unpaid_work_entry_types: - line_vals['amount'] = line_vals.get('number_of_hours', 0.0) * self._wage_for_work_type(work_type) - else: - line_vals['amount'] = 0.0 - - def _wage_for_work_type(self, work_type): - # Override if you pay differently for different work types - return self.contract_id.wage - - def _pre_aggregate_timesheet_data(self, default_workentrytype): - worked_ts = defaultdict(list) + def _pre_aggregate_timesheet_data(self, work_data, default_workentrytype): for ts in self.timesheet_ids.sorted('id'): if ts.unit_amount: ts_iso = ts.date.isocalendar() @@ -94,9 +55,8 @@ class HrPayslip(models.Model): 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 + work_data[ts_iso].append((timesheet_type, ts.unit_amount, ts)) + return work_data def action_open_timesheets(self): self.ensure_one() @@ -105,5 +65,9 @@ class HrPayslip(models.Model): 'name': _('Paid Timesheets'), 'res_model': 'account.analytic.line', 'view_mode': 'tree,form', + 'context': { + 'default_employee_id': self.employee_id.id, + 'default_payslip_id': self.id, + }, 'domain': [('id', 'in', self.timesheet_ids.ids)], } diff --git a/hr_payroll_timesheet/tests/test_payslip_timesheet.py b/hr_payroll_timesheet/tests/test_payslip_timesheet.py index 862f1a7a..19287258 100644 --- a/hr_payroll_timesheet/tests/test_payslip_timesheet.py +++ b/hr_payroll_timesheet/tests/test_payslip_timesheet.py @@ -1,52 +1,76 @@ # Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. -from odoo.tests import common +from odoo.addons.hr_payroll_hibou.tests import common +from odoo.exceptions import ValidationError -class TestPayslipTimesheet(common.TransactionCase): +class TestPayslipTimesheet(common.TestPayslip): def setUp(self): super(TestPayslipTimesheet, self).setUp() + + self.work_type = self.env.ref('hr_timesheet_work_entry.work_input_timesheet') + self.overtime_rules = self.work_type.overtime_type_id + self.overtime_rules.hours_per_day = 0.0 + self.overtime_rules.multiplier = 1.5 + self.test_hourly_wage = 21.5 - self.employee = self.env.ref('hr.employee_hne') - self.contract = self.env['hr.contract'].create({ - 'name': 'Test', - 'employee_id': self.employee.id, - 'structure_type_id': self.env.ref('hr_payroll.structure_type_employee').id, - 'date_start': '2018-01-01', - 'resource_calendar_id': self.employee.resource_calendar_id.id, - 'wage': self.test_hourly_wage, - 'paid_hourly_timesheet': True, - 'state': 'open', - }) - self.payslip_dummy = self.env['hr.payslip'].create({ - 'name': 'test slip dummy', - 'employee_id': self.employee.id, - 'date_from': '2017-01-01', - 'date_to': '2017-01-31', - }) - self.payslip = self.env['hr.payslip'].create({ - 'name': 'test slip', - 'employee_id': self.employee.id, - 'date_from': '2018-01-01', - 'date_to': '2018-01-31', - }) - self.project = self.env['project.project'].create({ - 'name': 'Timesheets', - }) + self.employee = self._createEmployee() + self.contract = self._createContract(self.employee, + wage=self.test_hourly_wage, + hourly_wage=self.test_hourly_wage, + wage_type='hourly', + paid_hourly_timesheet=True) + self.work_entry_type_leave = self.env['hr.work.entry.type'].create({ 'name': 'Test PTO', 'code': 'TESTPTO', 'is_leave': True, }) - self.leave_type = self.env['hr.leave.type'].create({ - 'name': 'Test Paid Time Off', - 'time_type': 'leave', - 'allocation_type': 'no', - 'validity_start': False, - 'work_entry_type_id': self.work_entry_type_leave.id, + self.project = self.env['project.project'].create({ + 'name': 'Timesheets', }) + # self.test_hourly_wage = 21.5 + # self.employee = self.env.ref('hr.employee_hne') + # self.contract = self.env['hr.contract'].create({ + # 'name': 'Test', + # 'employee_id': self.employee.id, + # 'structure_type_id': self.env.ref('hr_payroll.structure_type_employee').id, + # 'date_start': '2018-01-01', + # 'resource_calendar_id': self.employee.resource_calendar_id.id, + # 'wage': self.test_hourly_wage, + # 'paid_hourly_timesheet': True, + # 'state': 'open', + # }) + # self.payslip_dummy = self.env['hr.payslip'].create({ + # 'name': 'test slip dummy', + # 'employee_id': self.employee.id, + # 'date_from': '2017-01-01', + # 'date_to': '2017-01-31', + # }) + # self.payslip = self.env['hr.payslip'].create({ + # 'name': 'test slip', + # 'employee_id': self.employee.id, + # 'date_from': '2018-01-01', + # 'date_to': '2018-01-31', + # }) + # self.project = self.env['project.project'].create({ + # 'name': 'Timesheets', + # }) + # self.work_entry_type_leave = self.env['hr.work.entry.type'].create({ + # 'name': 'Test PTO', + # 'code': 'TESTPTO', + # 'is_leave': True, + # }) + # self.leave_type = self.env['hr.leave.type'].create({ + # 'name': 'Test Paid Time Off', + # 'time_type': 'leave', + # 'allocation_type': 'no', + # 'validity_start': False, + # 'work_entry_type_id': self.work_entry_type_leave.id, + # }) + def test_payslip_timesheet(self): self.assertTrue(self.contract.paid_hourly_timesheet) @@ -76,6 +100,7 @@ class TestPayslipTimesheet(common.TransactionCase): 'name': 'test', }) + self.payslip_dummy = self._createPayslip(self.employee, '2017-01-01', '2017-01-31') # Make one that should be excluded. self.env['account.analytic.line'].create({ 'employee_id': self.employee.id, @@ -86,10 +111,9 @@ class TestPayslipTimesheet(common.TransactionCase): 'payslip_id': self.payslip_dummy.id, }) - self.payslip._onchange_employee() + self.payslip = self._createPayslip(self.employee, '2018-01-01', '2018-01-31') 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') @@ -172,6 +196,7 @@ class TestPayslipTimesheet(common.TransactionCase): 'work_type_id': worktype.id, }) + self.payslip_dummy = self._createPayslip(self.employee, '2017-01-01', '2017-01-31') # Make one that should be excluded. self.env['account.analytic.line'].create({ 'employee_id': self.employee.id, @@ -182,10 +207,9 @@ class TestPayslipTimesheet(common.TransactionCase): 'payslip_id': self.payslip_dummy.id, }) - self.payslip._onchange_employee() + self.payslip = self._createPayslip(self.employee, '2018-01-01', '2018-01-31') 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') @@ -200,21 +224,19 @@ class TestPayslipTimesheet(common.TransactionCase): def test_with_leave(self): - date_from = '2018-01-10' - date_to = '2018-01-11' - leave = self.env['hr.leave'].create({ - 'name': 'Test Leave', - 'employee_id': self.employee.id, - 'holiday_status_id': self.leave_type.id, - 'date_to': date_to, + date_from = '2020-01-10' + date_to = '2020-01-11' + self.env['resource.calendar.leaves'].create({ + 'name': 'Doctor Appointment', 'date_from': date_from, - 'number_of_days': 1, + 'date_to': date_to, + 'resource_id': self.employee.resource_id.id, + 'calendar_id': self.employee.resource_calendar_id.id, + 'work_entry_type_id': self.work_entry_type_leave.id, + 'time_type': 'leave', }) - leave.action_validate() - self.assertEqual(leave.state, 'validate') - self.payslip._onchange_employee() - self.assertTrue(self.payslip.contract_id, 'No auto-discovered contract!') - self.payslip.compute_sheet() + + self.payslip = self._createPayslip(self.employee, '2020-01-06', '2020-01-19') self.assertTrue(self.payslip.worked_days_line_ids) leave_line = self.payslip.worked_days_line_ids.filtered(lambda l: l.code == 'TESTPTO') diff --git a/hr_payroll_timesheet/views/hr_contract_view.xml b/hr_payroll_timesheet/views/hr_contract_view.xml index e3e06705..48c41e75 100755 --- a/hr_payroll_timesheet/views/hr_contract_view.xml +++ b/hr_payroll_timesheet/views/hr_contract_view.xml @@ -5,15 +5,9 @@ hr.contract - - - - - - / pay period - / hour - - + + + diff --git a/hr_payroll_timesheet/views/timesheet_views.xml b/hr_payroll_timesheet/views/timesheet_views.xml new file mode 100644 index 00000000..c7eeb3f4 --- /dev/null +++ b/hr_payroll_timesheet/views/timesheet_views.xml @@ -0,0 +1,30 @@ + + + + + account.analytic.line.tree.hr_timesheet.inherit + account.analytic.line + + + + + + + + + + + account.analytic.line.form.inherit + account.analytic.line + + + + + + + + + +