From 83c342746d7394af8fdb86c0afa2b8261dd9ec10 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 30 Apr 2018 08:15:31 -0700 Subject: [PATCH 1/6] Adding all from 11.0 https://github.com/hibou-io/odoo-hr-payroll hr_payroll_holidays hr_payroll_input_name_report hr_payroll_input_report hr_payroll_payment hr_payroll_timesheet hr_payslip_line_date l10n_us_fl_hr_payroll l10n_us_hr_payroll l10n_us_mo_hr_payroll l10n_us_oh_hr_payroll l10n_us_va_hr_payroll --- hr_payroll_timesheet/__init__.py | 3 ++ hr_payroll_timesheet/__manifest__.py | 18 ++++++++ hr_payroll_timesheet/hr_contract.py | 8 ++++ hr_payroll_timesheet/hr_contract_view.xml | 18 ++++++++ hr_payroll_timesheet/hr_payslip.py | 50 +++++++++++++++++++++++ 5 files changed, 97 insertions(+) create mode 100755 hr_payroll_timesheet/__init__.py create mode 100755 hr_payroll_timesheet/__manifest__.py create mode 100755 hr_payroll_timesheet/hr_contract.py create mode 100755 hr_payroll_timesheet/hr_contract_view.xml create mode 100755 hr_payroll_timesheet/hr_payslip.py diff --git a/hr_payroll_timesheet/__init__.py b/hr_payroll_timesheet/__init__.py new file mode 100755 index 00000000..4d15389f --- /dev/null +++ b/hr_payroll_timesheet/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +from . import hr_payslip +from . import hr_contract diff --git a/hr_payroll_timesheet/__manifest__.py b/hr_payroll_timesheet/__manifest__.py new file mode 100755 index 00000000..c3a9eae3 --- /dev/null +++ b/hr_payroll_timesheet/__manifest__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- + +{ + 'name': 'Timesheets on Payslips', + 'description': 'Get Timesheet and Attendence numbers onto Employee Payslips.', + 'version': '11.0.0.0.0', + 'website': 'https://hibou.io/', + 'author': 'Hibou Corp. ', + 'license': 'AGPL-3', + 'category': 'Human Resources', + 'data': [ + 'hr_contract_view.xml', + ], + 'depends': [ + 'hr_payroll', + 'hr_timesheet_attendance', + ], +} diff --git a/hr_payroll_timesheet/hr_contract.py b/hr_payroll_timesheet/hr_contract.py new file mode 100755 index 00000000..f2be76d4 --- /dev/null +++ b/hr_payroll_timesheet/hr_contract.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +from odoo import models, fields + + +class HrContract(models.Model): + _inherit = 'hr.contract' + + paid_hourly = fields.Boolean(string="Paid Hourly", default=False) diff --git a/hr_payroll_timesheet/hr_contract_view.xml b/hr_payroll_timesheet/hr_contract_view.xml new file mode 100755 index 00000000..abd831f5 --- /dev/null +++ b/hr_payroll_timesheet/hr_contract_view.xml @@ -0,0 +1,18 @@ + + + + + hr.contract.form.inherit + hr.contract + 20 + + + + + + + + + + + diff --git a/hr_payroll_timesheet/hr_payslip.py b/hr_payroll_timesheet/hr_payslip.py new file mode 100755 index 00000000..5d09c267 --- /dev/null +++ b/hr_payroll_timesheet/hr_payslip.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +from odoo import api, models + + +class HrPayslip(models.Model): + _inherit = 'hr.payslip' + + @api.model + def get_worked_day_lines(self, contracts, date_from, date_to): + def create_empty_worked_lines(employee_id, contract_id, date_from, date_to): + attendance = { + 'name': 'Timesheet Attendance', + 'sequence': 10, + 'code': 'ATTN', + 'number_of_days': 0.0, + 'number_of_hours': 0.0, + 'contract_id': contract_id, + } + + valid_days = [ + ('sheet_id.employee_id', '=', employee_id), + ('sheet_id.state', '=', 'done'), + ('sheet_id.date_from', '>=', date_from), + ('sheet_id.date_to', '<=', date_to), + ] + return attendance, valid_days + + attendances = [] + + for contract in contracts: + attendance, valid_days = create_empty_worked_lines( + contract.employee_id.id, + contract.id, + date_from, + date_to + ) + + for day in self.env['hr_timesheet_sheet.sheet.day'].search(valid_days): + if day.total_attendance >= 0.0: + attendance['number_of_days'] += 1 + attendance['number_of_hours'] += day.total_attendance + + # needed so that the shown hours matches any calculations you use them for + attendance['number_of_hours'] = round(attendance['number_of_hours'], 2) + attendances.append(attendance) + + res = super(HrPayslip, self).get_worked_day_lines(contracts, date_from, date_to) + res.extend(attendances) + return res + From cd1880aa128d7d9d974176b90ee31af87b0ee658 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 9 May 2018 16:01:49 -0700 Subject: [PATCH 2/6] Proper migration to 11.0, and implementation of 'overtime rules' breakdown of hours/weeks. --- hr_payroll_timesheet/hr_contract_view.xml | 2 +- hr_payroll_timesheet/hr_payslip.py | 91 ++++++++++++++++------- 2 files changed, 66 insertions(+), 27 deletions(-) diff --git a/hr_payroll_timesheet/hr_contract_view.xml b/hr_payroll_timesheet/hr_contract_view.xml index abd831f5..6b8edde4 100755 --- a/hr_payroll_timesheet/hr_contract_view.xml +++ b/hr_payroll_timesheet/hr_contract_view.xml @@ -8,7 +8,7 @@ - + diff --git a/hr_payroll_timesheet/hr_payslip.py b/hr_payroll_timesheet/hr_payslip.py index 5d09c267..b320495b 100755 --- a/hr_payroll_timesheet/hr_payslip.py +++ b/hr_payroll_timesheet/hr_payslip.py @@ -1,5 +1,8 @@ -# -*- coding: utf-8 -*- +from datetime import datetime +from collections import defaultdict from odoo import api, models +from odoo.exceptions import ValidationError +from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT class HrPayslip(models.Model): @@ -7,44 +10,80 @@ class HrPayslip(models.Model): @api.model def get_worked_day_lines(self, contracts, date_from, date_to): - def create_empty_worked_lines(employee_id, contract_id, date_from, date_to): - attendance = { - 'name': 'Timesheet Attendance', + def create_empty_worked_lines(employee, contract, date_from, date_to): + attn = { + 'name': 'Attendance', 'sequence': 10, 'code': 'ATTN', 'number_of_days': 0.0, 'number_of_hours': 0.0, - 'contract_id': contract_id, + 'contract_id': contract.id, } - valid_days = [ - ('sheet_id.employee_id', '=', employee_id), - ('sheet_id.state', '=', 'done'), - ('sheet_id.date_from', '>=', date_from), - ('sheet_id.date_to', '<=', date_to), + valid_attn = [ + ('employee_id', '=', employee.id), + ('check_in', '>=', date_from), + ('check_in', '<=', date_to), ] - return attendance, valid_days - - attendances = [] + return attn, valid_attn + work = [] for contract in contracts: - attendance, valid_days = create_empty_worked_lines( - contract.employee_id.id, - contract.id, + worked_attn, valid_attn = create_empty_worked_lines( + contract.employee_id, + contract, date_from, date_to ) - - for day in self.env['hr_timesheet_sheet.sheet.day'].search(valid_days): - if day.total_attendance >= 0.0: - attendance['number_of_days'] += 1 - attendance['number_of_hours'] += day.total_attendance - - # needed so that the shown hours matches any calculations you use them for - attendance['number_of_hours'] = round(attendance['number_of_hours'], 2) - attendances.append(attendance) + days = set() + for attn in self.env['hr.attendance'].search(valid_attn): + if not attn.check_out: + raise ValidationError('This pay period must not have any open attendances.') + if attn.worked_hours: + # Avoid in/outs + attn_start_time = datetime.strptime(attn.check_in, DEFAULT_SERVER_DATETIME_FORMAT) + attn_iso = attn_start_time.isocalendar() + if not attn_iso in days: + worked_attn['number_of_days'] += 1 + days.add(attn_iso) + worked_attn['number_of_hours'] += attn.worked_hours + worked_attn['number_of_hours'] = round(worked_attn['number_of_hours'], 2) + work.append(worked_attn) res = super(HrPayslip, self).get_worked_day_lines(contracts, date_from, date_to) - res.extend(attendances) + res.extend(work) return res + @api.multi + def hour_break_down(self, code): + """ + :param code: what kind of worked days you need aggregated + :return: dict: keys are isocalendar tuples, values are hours. + """ + self.ensure_one() + if code == 'ATTN': + attns = self.env['hr.attendance'].search([ + ('employee_id', '=', self.employee_id.id), + ('check_in', '>=', self.date_from), + ('check_in', '<=', self.date_to), + ]) + day_values = defaultdict(float) + for attn in attns: + if not attn.check_out: + raise ValidationError('This pay period must not have any open attendances.') + if attn.worked_hours: + # Avoid in/outs + attn_start_time = datetime.strptime(attn.check_in, DEFAULT_SERVER_DATETIME_FORMAT) + attn_iso = attn_start_time.isocalendar() + day_values[attn_iso] += attn.worked_hours + return day_values + elif hasattr(super(HrPayslip, self), 'hours'): + return super(HrPayslip, self).hours(code) + + @api.multi + def hours_break_down_week(self, code): + days = self.hour_break_down(code) + weeks = defaultdict(float) + for isoday, hours in days.items(): + weeks[isoday[1]] += hours + return weeks From 19fa0dba34bf33056bb4c8d1b911f915c51208e9 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 31 Oct 2018 09:58:09 -0700 Subject: [PATCH 3/6] Initial commit of *new* `hr_payroll_timesheet` and `hr_payroll_timesheet_old` for 11.0 --- hr_payroll_timesheet/__init__.py | 4 +- hr_payroll_timesheet/__manifest__.py | 10 +- hr_payroll_timesheet/hr_contract.py | 8 -- hr_payroll_timesheet/hr_contract_view.xml | 18 ---- hr_payroll_timesheet/hr_payslip.py | 89 ----------------- hr_payroll_timesheet/models/__init__.py | 2 + hr_payroll_timesheet/models/hr_contract.py | 7 ++ hr_payroll_timesheet/models/hr_payslip.py | 99 +++++++++++++++++++ hr_payroll_timesheet/tests/__init__.py | 1 + .../tests/test_payslip_timesheet.py | 87 ++++++++++++++++ .../views/hr_contract_view.xml | 19 ++++ 11 files changed, 220 insertions(+), 124 deletions(-) mode change 100755 => 100644 hr_payroll_timesheet/__init__.py delete mode 100755 hr_payroll_timesheet/hr_contract.py delete mode 100755 hr_payroll_timesheet/hr_contract_view.xml delete mode 100755 hr_payroll_timesheet/hr_payslip.py create mode 100644 hr_payroll_timesheet/models/__init__.py create mode 100644 hr_payroll_timesheet/models/hr_contract.py create mode 100644 hr_payroll_timesheet/models/hr_payslip.py create mode 100755 hr_payroll_timesheet/tests/__init__.py create mode 100644 hr_payroll_timesheet/tests/test_payslip_timesheet.py create mode 100755 hr_payroll_timesheet/views/hr_contract_view.xml diff --git a/hr_payroll_timesheet/__init__.py b/hr_payroll_timesheet/__init__.py old mode 100755 new mode 100644 index 4d15389f..0650744f --- a/hr_payroll_timesheet/__init__.py +++ b/hr_payroll_timesheet/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- -from . import hr_payslip -from . import hr_contract +from . import models diff --git a/hr_payroll_timesheet/__manifest__.py b/hr_payroll_timesheet/__manifest__.py index c3a9eae3..7c842873 100755 --- a/hr_payroll_timesheet/__manifest__.py +++ b/hr_payroll_timesheet/__manifest__.py @@ -1,18 +1,16 @@ -# -*- coding: utf-8 -*- - { 'name': 'Timesheets on Payslips', - 'description': 'Get Timesheet and Attendence numbers onto Employee Payslips.', - 'version': '11.0.0.0.0', + 'description': 'Get Timesheet hours onto Employee Payslips.', + 'version': '11.0.1.0.0', 'website': 'https://hibou.io/', 'author': 'Hibou Corp. ', 'license': 'AGPL-3', 'category': 'Human Resources', 'data': [ - 'hr_contract_view.xml', + 'views/hr_contract_view.xml', ], 'depends': [ 'hr_payroll', - 'hr_timesheet_attendance', + 'hr_timesheet', ], } diff --git a/hr_payroll_timesheet/hr_contract.py b/hr_payroll_timesheet/hr_contract.py deleted file mode 100755 index f2be76d4..00000000 --- a/hr_payroll_timesheet/hr_contract.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import models, fields - - -class HrContract(models.Model): - _inherit = 'hr.contract' - - paid_hourly = fields.Boolean(string="Paid Hourly", default=False) diff --git a/hr_payroll_timesheet/hr_contract_view.xml b/hr_payroll_timesheet/hr_contract_view.xml deleted file mode 100755 index 6b8edde4..00000000 --- a/hr_payroll_timesheet/hr_contract_view.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - hr.contract.form.inherit - hr.contract - 20 - - - - - - - - - - - diff --git a/hr_payroll_timesheet/hr_payslip.py b/hr_payroll_timesheet/hr_payslip.py deleted file mode 100755 index b320495b..00000000 --- a/hr_payroll_timesheet/hr_payslip.py +++ /dev/null @@ -1,89 +0,0 @@ -from datetime import datetime -from collections import defaultdict -from odoo import api, models -from odoo.exceptions import ValidationError -from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT - - -class HrPayslip(models.Model): - _inherit = 'hr.payslip' - - @api.model - def get_worked_day_lines(self, contracts, date_from, date_to): - def create_empty_worked_lines(employee, contract, date_from, date_to): - attn = { - 'name': 'Attendance', - 'sequence': 10, - 'code': 'ATTN', - 'number_of_days': 0.0, - 'number_of_hours': 0.0, - 'contract_id': contract.id, - } - - valid_attn = [ - ('employee_id', '=', employee.id), - ('check_in', '>=', date_from), - ('check_in', '<=', date_to), - ] - return attn, valid_attn - - work = [] - for contract in contracts: - worked_attn, valid_attn = create_empty_worked_lines( - contract.employee_id, - contract, - date_from, - date_to - ) - days = set() - for attn in self.env['hr.attendance'].search(valid_attn): - if not attn.check_out: - raise ValidationError('This pay period must not have any open attendances.') - if attn.worked_hours: - # Avoid in/outs - attn_start_time = datetime.strptime(attn.check_in, DEFAULT_SERVER_DATETIME_FORMAT) - attn_iso = attn_start_time.isocalendar() - if not attn_iso in days: - worked_attn['number_of_days'] += 1 - days.add(attn_iso) - worked_attn['number_of_hours'] += attn.worked_hours - worked_attn['number_of_hours'] = round(worked_attn['number_of_hours'], 2) - work.append(worked_attn) - - res = super(HrPayslip, self).get_worked_day_lines(contracts, date_from, date_to) - res.extend(work) - return res - - @api.multi - def hour_break_down(self, code): - """ - :param code: what kind of worked days you need aggregated - :return: dict: keys are isocalendar tuples, values are hours. - """ - self.ensure_one() - if code == 'ATTN': - attns = self.env['hr.attendance'].search([ - ('employee_id', '=', self.employee_id.id), - ('check_in', '>=', self.date_from), - ('check_in', '<=', self.date_to), - ]) - day_values = defaultdict(float) - for attn in attns: - if not attn.check_out: - raise ValidationError('This pay period must not have any open attendances.') - if attn.worked_hours: - # Avoid in/outs - attn_start_time = datetime.strptime(attn.check_in, DEFAULT_SERVER_DATETIME_FORMAT) - attn_iso = attn_start_time.isocalendar() - day_values[attn_iso] += attn.worked_hours - return day_values - elif hasattr(super(HrPayslip, self), 'hours'): - return super(HrPayslip, self).hours(code) - - @api.multi - def hours_break_down_week(self, code): - days = self.hour_break_down(code) - weeks = defaultdict(float) - for isoday, hours in days.items(): - weeks[isoday[1]] += hours - return weeks diff --git a/hr_payroll_timesheet/models/__init__.py b/hr_payroll_timesheet/models/__init__.py new file mode 100644 index 00000000..9199a523 --- /dev/null +++ b/hr_payroll_timesheet/models/__init__.py @@ -0,0 +1,2 @@ +from . import hr_contract +from . import hr_payslip diff --git a/hr_payroll_timesheet/models/hr_contract.py b/hr_payroll_timesheet/models/hr_contract.py new file mode 100644 index 00000000..d0ac4d1d --- /dev/null +++ b/hr_payroll_timesheet/models/hr_contract.py @@ -0,0 +1,7 @@ +from odoo import fields, models + + +class HrContract(models.Model): + _inherit = 'hr.contract' + + paid_hourly_timesheet = fields.Boolean(string="Paid Hourly Timesheet", default=False) diff --git a/hr_payroll_timesheet/models/hr_payslip.py b/hr_payroll_timesheet/models/hr_payslip.py new file mode 100644 index 00000000..cd6299ba --- /dev/null +++ b/hr_payroll_timesheet/models/hr_payslip.py @@ -0,0 +1,99 @@ +from datetime import datetime +from collections import defaultdict +from odoo import api, models +from odoo.tools import DEFAULT_SERVER_DATE_FORMAT + + +class HrPayslip(models.Model): + _inherit = 'hr.payslip' + + @api.model + def get_worked_day_lines(self, contracts, date_from, date_to): + work = [] + for contract in contracts.filtered(lambda c: c.paid_hourly_timesheet): + # Only run on 'paid hourly timesheet' contracts. + res = self._get_worked_day_lines_hourly_timesheet(contract, date_from, date_to) + if res: + work.append(res) + + res = super(HrPayslip, self).get_worked_day_lines(contracts.filtered(lambda c: not c.paid_hourly_timesheet), date_from, date_to) + res.extend(work) + return res + + def _get_worked_day_lines_hourly_timesheet(self, contract, date_from, date_to): + """ + This would be a common hook to extend or break out more functionality, like pay rate based on project. + Note that you will likely need to aggregate similarly in hour_break_down() and hour_break_down_week() + :param contract: `hr.contract` + :param date_from: str + :param date_to: str + :return: dict of values for `hr.payslip.worked_days` + """ + values = { + 'name': 'Timesheet', + 'sequence': 15, + 'code': 'TS', + 'number_of_days': 0.0, + 'number_of_hours': 0.0, + 'contract_id': contract.id, + } + + valid_ts = [ + # ('is_timesheet', '=', True), + # 'is_timesheet' is computed if there is a project_id associated with the entry + ('project_id', '!=', False), + ('employee_id', '=', contract.employee_id.id), + ('date', '>=', date_from), + ('date', '<=', date_to), + ] + + days = set() + for ts in self.env['account.analytic.line'].search(valid_ts): + if ts.unit_amount: + ts_date = datetime.strptime(ts.date, DEFAULT_SERVER_DATE_FORMAT) + ts_iso = ts_date.isocalendar() + if ts_iso not in days: + values['number_of_days'] += 1 + days.add(ts_iso) + values['number_of_hours'] += ts.unit_amount + + values['number_of_hours'] = round(values['number_of_hours'], 2) + return values + + @api.multi + def hour_break_down(self, code): + """ + :param code: what kind of worked days you need aggregated + :return: dict: keys are isocalendar tuples, values are hours. + """ + self.ensure_one() + if code == 'TS': + timesheets = self.env['account.analytic.line'].search([ + # ('is_timesheet', '=', True), + # 'is_timesheet' is computed if there is a project_id associated with the entry + ('project_id', '!=', False), + ('employee_id', '=', self.employee_id.id), + ('date', '>=', self.date_from), + ('date', '<=', self.date_to), + ]) + day_values = defaultdict(float) + for ts in timesheets: + if ts.unit_amount: + ts_date = datetime.strptime(ts.date, DEFAULT_SERVER_DATE_FORMAT) + ts_iso = ts_date.isocalendar() + day_values[ts_iso] += ts.unit_amount + return day_values + elif hasattr(super(HrPayslip, self), 'hour_break_down'): + return super(HrPayslip, self).hour_break_down(code) + + @api.multi + def hours_break_down_week(self, code): + """ + :param code: hat kind of worked days you need aggregated + :return: dict: keys are isocalendar weeks, values are hours. + """ + days = self.hour_break_down(code) + weeks = defaultdict(float) + for isoday, hours in days.items(): + weeks[isoday[1]] += hours + return weeks diff --git a/hr_payroll_timesheet/tests/__init__.py b/hr_payroll_timesheet/tests/__init__.py new file mode 100755 index 00000000..1345fb8f --- /dev/null +++ b/hr_payroll_timesheet/tests/__init__.py @@ -0,0 +1 @@ +from . import test_payslip_timesheet diff --git a/hr_payroll_timesheet/tests/test_payslip_timesheet.py b/hr_payroll_timesheet/tests/test_payslip_timesheet.py new file mode 100644 index 00000000..f19e7c3d --- /dev/null +++ b/hr_payroll_timesheet/tests/test_payslip_timesheet.py @@ -0,0 +1,87 @@ +from odoo.tests import common +from odoo import fields + + +class TestPayslipTimesheet(common.TransactionCase): + + def setUp(self): + super(TestPayslipTimesheet, self).setUp() + self.employee = self.env['hr.employee'].create({ + 'birthday': '1985-03-14', + 'country_id': self.ref('base.us'), + 'department_id': self.ref('hr.dep_rd'), + 'gender': 'male', + 'name': 'Jared' + }) + self.contract = self.env['hr.contract'].create({ + 'name': 'test', + 'employee_id': self.employee.id, + 'type_id': self.ref('hr_contract.hr_contract_type_emp'), + 'struct_id': self.ref('hr_payroll.structure_base'), + 'resource_calendar_id': self.ref('resource.resource_calendar_std'), + 'wage': 21.50, + 'date_start': '2018-01-01', + 'state': 'open', + 'paid_hourly_timesheet': True, + 'schedule_pay': 'monthly', + }) + self.project = self.env['project.project'].create({ + 'name': 'Timesheets', + }) + + def test_payslip_timesheet(self): + self.assertTrue(self.contract.paid_hourly_timesheet) + from_date = '2018-01-01' + to_date = '2018-01-31' + + # 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, + }) + self.env['account.analytic.line'].create({ + 'employee_id': self.employee.id, + 'project_id': self.project.id, + 'date': '2018-01-01', + 'unit_amount': 3.0, + }) + + # Day 2 + self.env['account.analytic.line'].create({ + 'employee_id': self.employee.id, + 'project_id': self.project.id, + 'date': '2018-01-02', + 'unit_amount': 1.0, + }) + + # 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, + }) + + # Create slip like a batch run. + slip_data = self.env['hr.payslip'].onchange_employee_id(from_date, to_date, self.employee.id, contract_id=False) + res = { + 'employee_id': self.employee.id, + 'name': slip_data['value'].get('name'), + 'struct_id': slip_data['value'].get('struct_id'), + 'contract_id': slip_data['value'].get('contract_id'), + 'input_line_ids': [(0, 0, x) for x in slip_data['value'].get('input_line_ids')], + 'worked_days_line_ids': [(0, 0, x) for x in slip_data['value'].get('worked_days_line_ids')], + 'date_from': from_date, + 'date_to': to_date, + 'company_id': self.employee.company_id.id, + } + payslip = self.env['hr.payslip'].create(res) + payslip.compute_sheet() + self.assertTrue(payslip.worked_days_line_ids) + + timesheet_line = payslip.worked_days_line_ids.filtered(lambda l: l.code == 'TS') + self.assertTrue(timesheet_line) + self.assertEqual(timesheet_line.number_of_days, 2.0) + self.assertEqual(timesheet_line.number_of_hours, 9.0) diff --git a/hr_payroll_timesheet/views/hr_contract_view.xml b/hr_payroll_timesheet/views/hr_contract_view.xml new file mode 100755 index 00000000..e3e06705 --- /dev/null +++ b/hr_payroll_timesheet/views/hr_contract_view.xml @@ -0,0 +1,19 @@ + + + + hr.contract.form.inherit + hr.contract + + + + + + + + / pay period + / hour + + + + + From e5d1225b0f187d255120cfbec7e93835f4e0c39e Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 31 Oct 2018 10:35:04 -0700 Subject: [PATCH 4/6] Initial commit of `hr_payroll_timesheet_holidays` for 11.0 --- hr_payroll_timesheet_holidays/__init__.py | 1 + hr_payroll_timesheet_holidays/__manifest__.py | 15 ++++++ hr_payroll_timesheet_holidays/hr_payslip.py | 52 +++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100755 hr_payroll_timesheet_holidays/__init__.py create mode 100755 hr_payroll_timesheet_holidays/__manifest__.py create mode 100755 hr_payroll_timesheet_holidays/hr_payslip.py diff --git a/hr_payroll_timesheet_holidays/__init__.py b/hr_payroll_timesheet_holidays/__init__.py new file mode 100755 index 00000000..5d988fa2 --- /dev/null +++ b/hr_payroll_timesheet_holidays/__init__.py @@ -0,0 +1 @@ +from . import hr_payslip diff --git a/hr_payroll_timesheet_holidays/__manifest__.py b/hr_payroll_timesheet_holidays/__manifest__.py new file mode 100755 index 00000000..07289632 --- /dev/null +++ b/hr_payroll_timesheet_holidays/__manifest__.py @@ -0,0 +1,15 @@ +{ + 'name': 'Payroll Timesheet Holidays', + 'author': 'Hibou Corp. ', + 'version': '11.0.1.0.0', + 'category': 'Human Resources', + 'sequence': 95, + 'summary': 'Holiday Pay', + 'description': """ +Simplifies getting approved Holiday Leaves onto an employee Payslip. + """, + 'website': 'https://hibou.io/', + 'depends': ['hr_payroll_timesheet', 'hr_holidays'], + 'installable': True, + 'application': False, +} diff --git a/hr_payroll_timesheet_holidays/hr_payslip.py b/hr_payroll_timesheet_holidays/hr_payslip.py new file mode 100755 index 00000000..b85acc44 --- /dev/null +++ b/hr_payroll_timesheet_holidays/hr_payslip.py @@ -0,0 +1,52 @@ +from odoo import models, api +from odoo.addons.hr_holidays.models.hr_holidays import HOURS_PER_DAY + + +class HrPayslip(models.Model): + _inherit = 'hr.payslip' + + @api.model + def get_worked_day_lines(self, contracts, date_from, date_to): + leaves = {} + + for contract in contracts.filtered(lambda c: c.paid_hourly_timesheet): + for leave in self._fetch_valid_leaves_timesheet(contract.employee_id.id, date_from, date_to): + leave_code = self._create_leave_code(leave.holiday_status_id.name) + if leave_code in leaves: + leaves[leave_code]['number_of_days'] += leave.number_of_days_temp + leaves[leave_code]['number_of_hours'] += leave.number_of_days_temp * HOURS_PER_DAY + else: + leaves[leave_code] = { + 'name': leave.holiday_status_id.name, + 'sequence': 15, + 'code': leave_code, + 'number_of_days': leave.number_of_days_temp, + 'number_of_hours': leave.number_of_days_temp * HOURS_PER_DAY, + 'contract_id': contract.id, + } + + res = super(HrPayslip, self).get_worked_day_lines(contracts, date_from, date_to) + res.extend(leaves.values()) + return res + + @api.multi + def action_payslip_done(self): + for slip in self.filtered(lambda s: s.contract_id.paid_hourly_timesheet): + leaves = self._fetch_valid_leaves_timesheet(slip.employee_id.id, slip.date_from, slip.date_to) + leaves.write({'payslip_status': True}) + return super(HrPayslip, self).action_payslip_done() + + def _fetch_valid_leaves_timesheet(self, employee_id, date_from, date_to): + valid_leaves = [ + ('employee_id', '=', employee_id), + ('state', '=', 'validate'), + ('date_from', '>=', date_from), + ('date_from', '<=', date_to), + ('payslip_status', '=', False), + ('type', '=', 'remove'), + ] + + return self.env['hr.holidays'].search(valid_leaves) + + def _create_leave_code(self, name): + return 'L_' + name.replace(' ', '_') From 003699c7d72b496ba78819e17f02e228decb29e2 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 12 Mar 2019 11:51:07 -0700 Subject: [PATCH 5/6] MIG `hr_payroll_timesheet` to 12.0 --- hr_payroll_timesheet/__manifest__.py | 2 +- hr_payroll_timesheet/models/hr_payslip.py | 8 ++------ hr_payroll_timesheet/tests/test_payslip_timesheet.py | 4 ++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hr_payroll_timesheet/__manifest__.py b/hr_payroll_timesheet/__manifest__.py index 7c842873..e3603436 100755 --- a/hr_payroll_timesheet/__manifest__.py +++ b/hr_payroll_timesheet/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Timesheets on Payslips', 'description': 'Get Timesheet hours onto Employee Payslips.', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'website': 'https://hibou.io/', 'author': 'Hibou Corp. ', 'license': 'AGPL-3', diff --git a/hr_payroll_timesheet/models/hr_payslip.py b/hr_payroll_timesheet/models/hr_payslip.py index cd6299ba..7df4cdff 100644 --- a/hr_payroll_timesheet/models/hr_payslip.py +++ b/hr_payroll_timesheet/models/hr_payslip.py @@ -1,7 +1,5 @@ -from datetime import datetime from collections import defaultdict from odoo import api, models -from odoo.tools import DEFAULT_SERVER_DATE_FORMAT class HrPayslip(models.Model): @@ -50,8 +48,7 @@ class HrPayslip(models.Model): days = set() for ts in self.env['account.analytic.line'].search(valid_ts): if ts.unit_amount: - ts_date = datetime.strptime(ts.date, DEFAULT_SERVER_DATE_FORMAT) - ts_iso = ts_date.isocalendar() + ts_iso = ts.date.isocalendar() if ts_iso not in days: values['number_of_days'] += 1 days.add(ts_iso) @@ -79,8 +76,7 @@ class HrPayslip(models.Model): day_values = defaultdict(float) for ts in timesheets: if ts.unit_amount: - ts_date = datetime.strptime(ts.date, DEFAULT_SERVER_DATE_FORMAT) - ts_iso = ts_date.isocalendar() + ts_iso = ts.date.isocalendar() day_values[ts_iso] += ts.unit_amount return day_values elif hasattr(super(HrPayslip, self), 'hour_break_down'): diff --git a/hr_payroll_timesheet/tests/test_payslip_timesheet.py b/hr_payroll_timesheet/tests/test_payslip_timesheet.py index f19e7c3d..571b6b20 100644 --- a/hr_payroll_timesheet/tests/test_payslip_timesheet.py +++ b/hr_payroll_timesheet/tests/test_payslip_timesheet.py @@ -40,12 +40,14 @@ class TestPayslipTimesheet(common.TransactionCase): '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 @@ -54,6 +56,7 @@ class TestPayslipTimesheet(common.TransactionCase): 'project_id': self.project.id, 'date': '2018-01-02', 'unit_amount': 1.0, + 'name': 'test', }) # Make one that should be excluded. @@ -62,6 +65,7 @@ class TestPayslipTimesheet(common.TransactionCase): 'project_id': self.project.id, 'date': '2017-01-01', 'unit_amount': 5.0, + 'name': 'test', }) # Create slip like a batch run. From e5d3ab590fdb0a7c0c619b08826c9ae5df104c02 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 12 Mar 2019 11:51:29 -0700 Subject: [PATCH 6/6] MIG `hr_payroll_timesheet_holidays` to 12.0 --- hr_payroll_timesheet_holidays/__manifest__.py | 2 +- hr_payroll_timesheet_holidays/hr_payslip.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hr_payroll_timesheet_holidays/__manifest__.py b/hr_payroll_timesheet_holidays/__manifest__.py index 07289632..36a88163 100755 --- a/hr_payroll_timesheet_holidays/__manifest__.py +++ b/hr_payroll_timesheet_holidays/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Payroll Timesheet Holidays', 'author': 'Hibou Corp. ', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Human Resources', 'sequence': 95, 'summary': 'Holiday Pay', diff --git a/hr_payroll_timesheet_holidays/hr_payslip.py b/hr_payroll_timesheet_holidays/hr_payslip.py index b85acc44..474811ee 100755 --- a/hr_payroll_timesheet_holidays/hr_payslip.py +++ b/hr_payroll_timesheet_holidays/hr_payslip.py @@ -1,5 +1,5 @@ from odoo import models, api -from odoo.addons.hr_holidays.models.hr_holidays import HOURS_PER_DAY +from odoo.addons.resource.models.resource import HOURS_PER_DAY class HrPayslip(models.Model): @@ -13,15 +13,15 @@ class HrPayslip(models.Model): for leave in self._fetch_valid_leaves_timesheet(contract.employee_id.id, date_from, date_to): leave_code = self._create_leave_code(leave.holiday_status_id.name) if leave_code in leaves: - leaves[leave_code]['number_of_days'] += leave.number_of_days_temp - leaves[leave_code]['number_of_hours'] += leave.number_of_days_temp * HOURS_PER_DAY + leaves[leave_code]['number_of_days'] += leave.number_of_days + leaves[leave_code]['number_of_hours'] += leave.number_of_days * HOURS_PER_DAY else: leaves[leave_code] = { 'name': leave.holiday_status_id.name, 'sequence': 15, 'code': leave_code, - 'number_of_days': leave.number_of_days_temp, - 'number_of_hours': leave.number_of_days_temp * HOURS_PER_DAY, + 'number_of_days': leave.number_of_days, + 'number_of_hours': leave.number_of_days * HOURS_PER_DAY, 'contract_id': contract.id, } @@ -43,10 +43,10 @@ class HrPayslip(models.Model): ('date_from', '>=', date_from), ('date_from', '<=', date_to), ('payslip_status', '=', False), - ('type', '=', 'remove'), + ('holiday_status_id.unpaid', '=', False), ] - return self.env['hr.holidays'].search(valid_leaves) + return self.env['hr.leave'].search(valid_leaves) def _create_leave_code(self, name): return 'L_' + name.replace(' ', '_')