Merge branch 'mig/14.0/hr_payroll_timesheet' into '14.0'

mig/14.0/hr_payroll_timesheet into 14.0

See merge request hibou-io/hibou-odoo/suite!714

hr_payroll_attendance/__init__.py

@@ -0,0 +1,15 @@
+from . import models
+
+
+def attn_payroll_pre_init_hook(cr):
+    """
+    This module installs a Work Entry Type with code "ATTN_OT"
+    If you have undergone a migration (either for this module
+    or even your own Payslip Work Entry lines with code "ATTN_OT")
+    then the uniqueness constraint will prevent this module
+    from installing.
+    """
+    cr.execute("UPDATE hr_work_entry_type "
+               "SET code = 'ATTN_OT-PRE-INSTALL' "
+               "WHERE code = 'ATTN_OT';"
+               )

hr_payroll_attendance/__manifest__.py

@@ -0,0 +1,24 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'Attendance on Payslips',
+    'description': 'Get Attendence numbers onto Employee Payslips.',
+    'version': '14.0.1.0.0',
+    'website': 'https://hibou.io/',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'license': 'OPL-1',
+    'category': 'Human Resources',
+    'data': [
+        'data/hr_payroll_attendance_data.xml',
+        'views/hr_attendance_views.xml',
+        'views/hr_contract_views.xml',
+        'views/hr_payslip_views.xml',
+    ],
+    'depends': [
+        'hr_payroll_hibou',
+        'hr_attendance_work_entry',
+        'hr_payroll_overtime',
+        'hibou_professional',
+    ],
+    'pre_init_hook': 'attn_payroll_pre_init_hook',
+}

hr_payroll_attendance/data/hr_payroll_attendance_data.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Work Entry Type -->
+    <record id="work_input_attendance_overtime" model="hr.work.entry.type">
+        <field name="name">Attendance Overtime</field>
+        <field name="code">ATTN_OT</field>
+    </record>
+
+    <record id="hr_attendance_work_entry.work_input_attendance" model="hr.work.entry.type">
+        <field name="overtime_type_id" ref="hr_payroll_overtime.work_entry_overtime_type"/>
+        <field name="overtime_work_type_id" ref="work_input_attendance_overtime"/>
+    </record>
+
+</odoo>

hr_payroll_attendance/models/__init__.py

@@ -0,0 +1,3 @@
+from . import hr_attendance
+from . import hr_contract
+from . import hr_payslip

hr_payroll_attendance/models/hr_attendance.py

@@ -0,0 +1,33 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class HrAttendance(models.Model):
+    _inherit = 'hr.attendance'
+
+    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):
+        attn_with_payslip = self.filtered(lambda a: a.payslip_id)
+        attn_with_payslip.write({'payslip_id': False})
+        return super(HrAttendance, self - attn_with_payslip).unlink()

hr_payroll_attendance/models/hr_contract.py

@@ -0,0 +1,16 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, models, fields
+
+
+class HrContract(models.Model):
+    _inherit = 'hr.contract'
+
+    paid_hourly_attendance = fields.Boolean(string="Paid Hourly Attendance")
+
+    @api.onchange('paid_hourly_attendance')
+    def _onchange_paid_hourly_attendance(self):
+        for contract in self:
+            if contract.paid_hourly_attendance:
+                # only allow switch, not automatic switch 'back'
+                contract.wage_type = 'hourly'

hr_payroll_attendance/models/hr_payslip.py

@@ -0,0 +1,76 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+
+
+class HrPayslip(models.Model):
+    _inherit = 'hr.payslip'
+
+    attendance_ids = fields.One2many('hr.attendance', 'payslip_id', string='Attendances',
+                                     help='Attendances represented by payslip.', readonly=True,
+                                     states={'draft': [('readonly', False)], 'verify': [('readonly', False)]})
+    attendance_count = fields.Integer(compute='_compute_attendance_count')
+
+    @api.depends('attendance_ids', 'attendance_ids.payslip_id')
+    def _compute_attendance_count(self):
+        for payslip in self:
+            payslip.attendance_count = len(payslip.attendance_ids)
+
+    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_attendance:
+            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 _pre_aggregate_work_data(self):
+        work_data = super()._pre_aggregate_work_data()
+        if self.contract_id.paid_hourly_attendance:
+            attendance_to_keep = self.attendance_ids.filtered(lambda a: a.employee_id == self.employee_id
+                                                                        and a.check_out.date() <= self.date_to)
+            attendance_to_keep |= self.env['hr.attendance'].search([
+                ('employee_id', '=', self.employee_id.id),
+                ('check_out', '<=', self.date_to),
+                ('payslip_id', '=', False),
+            ])
+            self.update({'attendance_ids': [(6, 0, attendance_to_keep.ids)]})
+
+            attendance_type = self.env.ref('hr_attendance_work_entry.work_input_attendance', raise_if_not_found=False)
+            if not attendance_type:
+                # different default type
+                attendance_type = self.struct_id.type_id.default_work_entry_type_id
+                if not attendance_type:
+                    # return early, include the "work calendar lines"
+                    return work_data
+            work_data = self._pre_aggregate_attendance_data(work_data, attendance_type)
+        return work_data
+
+    def _pre_aggregate_attendance_data(self, work_data, default_workentrytype):
+        for attn in self.attendance_ids:
+            if attn.worked_hours:
+                # Avoid in/outs
+                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
+                    # if we don't then they will be eligible for overtime even
+                    # if this time wasn't intended to be paid
+                    continue
+                work_data[attn_iso].append((attendance_type, attn.worked_hours, attn))
+        return work_data
+
+    def action_open_attendances(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Paid Attendances'),
+            'res_model': 'hr.attendance',
+            'view_mode': 'tree,form',
+            'context': {
+                'default_employee_id': self.employee_id.id,
+                'default_payslip_id': self.id,
+            },
+            'domain': [('id', 'in', self.attendance_ids.ids)],
+        }

hr_payroll_attendance/tests/__init__.py

@@ -0,0 +1 @@
+from . import test_payroll_attendance

hr_payroll_attendance/tests/test_payroll_attendance.py

@@ -0,0 +1,161 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo.addons.hr_payroll_hibou.tests import common
+from odoo.exceptions import ValidationError
+
+
+class TestAttendancePayslip(common.TestPayslip):
+
+    def setUp(self):
+        super().setUp()
+        self.work_type = self.env.ref('hr_attendance_work_entry.work_input_attendance')
+        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._createEmployee()
+        self.contract = self._createContract(self.employee,
+                                             wage=self.test_hourly_wage,
+                                             hourly_wage=self.test_hourly_wage,
+                                             wage_type='hourly',
+                                             paid_hourly_attendance=True)
+
+        self.work_entry_type_leave = self.env['hr.work.entry.type'].create({
+            'name': 'Test PTO',
+            'code': 'TESTPTO',
+            'is_leave': True,
+        })
+
+    def _setup_attendance(self, employee):
+        # Total 127.37 hours in 2 weeks.
+        # Six 9-hour days in one week (plus a little). 58.97 hours in that week.
+        attendances = self.env['hr.attendance']
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-06 10:00:00',  # Monday
+            'check_out': '2020-01-06 19:00:00',
+        })
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-07 10:00:00',
+            'check_out': '2020-01-07 19:00:00',
+        })
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-08 10:00:00',
+            'check_out': '2020-01-08 19:00:00',
+        })
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-09 10:00:00',
+            'check_out': '2020-01-09 19:00:00',
+        })
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-10 10:00:00',
+            'check_out': '2020-01-10 19:00:00',
+        })
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-11 06:00:00',
+            'check_out': '2020-01-11 19:58:12',
+        })
+
+        # Five 10-hour days, Two 9-hour days (plus a little) in one week. 68.4 hours in that week
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-13 08:00:00',  # Monday
+            'check_out': '2020-01-13 18:00:00',
+        })
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-14 08:00:00',
+            'check_out': '2020-01-14 18:00:00',
+        })
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-15 08:00:00',
+            'check_out': '2020-01-15 18:00:00',
+        })
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-16 08:00:00',
+            'check_out': '2020-01-16 18:00:00',
+        })
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-17 08:00:00',
+            'check_out': '2020-01-17 18:00:00',
+        })
+        attendances += self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-18 09:00:00',
+            'check_out': '2020-01-18 18:00:00',
+        })
+        last = self.env['hr.attendance'].create({
+            'employee_id': employee.id,
+            'check_in': '2020-01-19 09:00:00',
+            'check_out': '2020-01-19 18:24:00',
+        })
+        attendances += last
+        return last
+
+    def test_attendance_hourly(self):
+        attn_last = self._setup_attendance(self.employee)
+        self.payslip = self._createPayslip(self.employee, '2020-01-06', '2020-01-19')
+        self.assertTrue(self.payslip.contract_id, 'No auto-discovered contract!')
+        self.payslip.compute_sheet()
+        # 58.97 => 40hr regular, 18.97hr OT
+        # 68.4  => 40hr regular, 28.4hr  OT
+        # (80 * 21.50) + (47.37 * 21.50 * 1.5) = 3247.6825
+        cats = self._getCategories(self.payslip)
+        self.assertAlmostEqual(cats['BASIC'], 3247.68, 2)
+
+        # ensure unlink behavior.
+        self.payslip.attendance_ids = self.env['hr.attendance'].browse()
+        self.payslip.state = 'draft'
+        self.payslip.flush()
+        self.payslip._onchange_employee()
+        self.payslip.compute_sheet()
+        cats = self._getCategories(self.payslip)
+        self.assertAlmostEqual(cats['BASIC'], 3247.68, 2)
+
+        self.payslip.write({'attendance_ids': [(5, 0, 0)]})
+        self.payslip.state = 'draft'
+        self.payslip.flush()
+        self.payslip._onchange_employee()
+        self.payslip.compute_sheet()
+        cats = self._getCategories(self.payslip)
+        self.assertAlmostEqual(cats['BASIC'], 3247.68, 2)
+
+        self.process_payslip()
+        self.assertTrue(self.payslip.state not in ('draft', 'verify'))
+        self.assertEqual(self.payslip, attn_last.payslip_id)
+        # can empty, by design you have to be able to do so
+        attn_last.payslip_id = False
+        with self.assertRaises(ValidationError):
+            # cannot re-assign as it is a finished payslip
+            attn_last.payslip_id = self.payslip
+
+    def test_with_leave(self):
+        date_from = '2020-01-10'
+        date_to = '2020-01-11'
+        self.env['resource.calendar.leaves'].create({
+            'name': 'Doctor Appointment',
+            'date_from': date_from,
+            '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',
+        })
+
+        self._setup_attendance(self.employee)
+        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')
+        self.assertTrue(leave_line)
+        self.assertEqual(leave_line.number_of_days, 1.0)
+        self.assertEqual(leave_line.number_of_hours, 8.0)
+        self.assertEqual(leave_line.amount, 8.0 * self.test_hourly_wage)

hr_payroll_attendance/views/hr_attendance_views.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_attendance_tree_inherit" model="ir.ui.view">
+        <field name="name">hr.attendance.tree.inherit</field>
+        <field name="model">hr.attendance</field>
+        <field name="inherit_id" ref="hr_attendance.view_attendance_tree"/>
+        <field name="arch" type="xml">
+        <data>
+            <xpath expr="//field[@name='worked_hours']" position="after">
+                <field name="payslip_id"
+                       domain="[('employee_id', '=', employee_id)]" />
+            </xpath>
+        </data>
+        </field>
+    </record>
+
+</odoo>

hr_payroll_attendance/views/hr_contract_views.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_contract_form_inherit" model="ir.ui.view">
+        <field name="name">hr.contract.form.inherit</field>
+        <field name="model">hr.contract</field>
+        <field name="priority">20</field>
+        <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='wage_type']" position="after">
+                <field name="paid_hourly_attendance"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

hr_payroll_attendance/views/hr_payslip_views.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_payslip_view_form_inherit" model="ir.ui.view">
+        <field name="name">hr.payslip.view.form.inherit</field>
+        <field name="model">hr.payslip</field>
+        <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button class="oe_stat_button" name="action_open_attendances" type="object" icon="fa-calendar" attrs="{'invisible': [('attendance_count', '=', 0)]}">
+                    <field string="Attendances" name="attendance_count" widget="statinfo"/>
+                </button>
+            </xpath>
+            <xpath expr="//field[@name='number']" position="after">
+                <field name="attendance_ids" invisible="1" widget="many2many"/>
+            </xpath>
+        </field>
+    </record>
+    
+</odoo>

hr_payroll_hibou/__manifest__.py

@@ -18,6 +18,7 @@ Base module for fixing specific qwerks or assumptions in the way Payroll Odoo En
 
     """,
     'data': [
+        'views/hr_contract_views.xml',
         'views/res_config_settings_views.xml',
     ],
     'demo': [

hr_payroll_hibou/models/__init__.py

@@ -1,4 +1,5 @@
 from . import browsable_object
+from . import hr_contract
 from . import hr_payslip
 from . import hr_salary_rule
 from . import res_config_settings

hr_payroll_hibou/models/hr_contract.py

@@ -0,0 +1,20 @@
+from odoo import fields, models
+
+
+class HrContract(models.Model):
+    _inherit = 'hr.contract'
+
+    wage_type = fields.Selection([('monthly', 'Period Fixed Wage'), ('hourly', 'Hourly Wage')],
+                                 default='monthly', required=True, related=False)
+
+    def _get_contract_wage(self, work_type=None):
+        # Override if you pay differently for different work types
+        # In 14.0, this utilizes new computed field mechanism,
+        # but will still get the 'wage' field by default.
+        self.ensure_one()
+        return self[self._get_contract_wage_field(work_type=work_type)]
+
+    def _get_contract_wage_field(self, work_type=None):
+        if self.wage_type == 'hourly':
+            return 'hourly_wage'
+        return super()._get_contract_wage_field()

hr_payroll_hibou/models/hr_payslip.py

@@ -6,9 +6,22 @@ from odoo import fields, models
 class HrPayslip(models.Model):
     _inherit = 'hr.payslip'
 
+    # We need to be able to support more complexity,
+    # namely, that different employees will be paid by different wage types as 'salary' vs 'hourly'
+    wage_type = fields.Selection(related='contract_id.wage_type')
+
     def get_year(self):
         """
         # Helper method to get the year (normalized between Odoo Versions)
         :return: int year of payslip
         """
         return self.date_to.year
+
+    def _get_contract_wage(self, work_type=None):
+        # Override if you pay differently for different work types
+        # In 14.0, this utilizes new computed field mechanism,
+        # but will still get the 'wage' field by default.
+
+        # This would be a good place to override though with a 'work type'
+        # based mechanism, like a minimum rate or 'rate card' implementation
+        return self.contract_id._get_contract_wage(work_type=work_type)

hr_payroll_hibou/models/res_config_settings.py

@@ -7,6 +7,8 @@ class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     # TODO We need MORE here...
+    module_hr_payroll_attendance = fields.Boolean(string='Attendance Entries & Overtime')
+    module_hr_payroll_timesheet = fields.Boolean(string='Timesheet Entries & Overtime')
     module_l10n_us_hr_payroll = fields.Boolean(string='USA Payroll')
     module_l10n_us_hr_payroll_401k = fields.Boolean(string='USA Payroll 401k')
 

hr_payroll_hibou/tests/__init__.py

@@ -2,4 +2,5 @@
 
 from . import common
 
+from . import test_contract_wage_type
 from . import test_special

hr_payroll_hibou/tests/common.py

@@ -10,16 +10,21 @@ from odoo.tools.float_utils import float_round as odoo_float_round
 
 def process_payslip(payslip):
     try:
-        payslip.action_payslip_done()
+        return payslip.action_payslip_done()
     except AttributeError:
         # v9
-        payslip.process_sheet()
+        return payslip.process_sheet()
 
 
 class TestPayslip(common.TransactionCase):
     debug = False
     _logger = getLogger(__name__)
 
+    def process_payslip(self, payslip=None):
+        if not payslip:
+            return process_payslip(self.payslip)
+        return process_payslip(payslip)
+
     def setUp(self):
         super(TestPayslip, self).setUp()
         self.contract_model = self.env['hr.contract']

hr_payroll_hibou/tests/test_contract_wage_type.py

@@ -0,0 +1,26 @@
+from .common import TestPayslip, process_payslip
+
+
+class TestContractWageType(TestPayslip):
+
+    def test_per_contract_wage_type_salary(self):
+        self.debug = True
+        salary = 80000.0
+        employee = self._createEmployee()
+        contract = self._createContract(employee, wage=salary, hourly_wage=salary/100.0, wage_type='monthly', schedule_pay='bi-weekly')
+        payslip = self._createPayslip(employee, '2019-12-30', '2020-01-12')
+        self.assertEqual(contract.wage_type, 'monthly')
+        self.assertEqual(payslip.wage_type, 'monthly')
+        cats = self._getCategories(payslip)
+        self.assertEqual(cats['BASIC'], salary)
+
+    def test_per_contract_wage_type_hourly(self):
+        self.debug = True
+        hourly_wage = 21.50
+        employee = self._createEmployee()
+        contract = self._createContract(employee, wage=hourly_wage*100.0, hourly_wage=hourly_wage, wage_type='hourly', schedule_pay='bi-weekly')
+        payslip = self._createPayslip(employee, '2019-12-30', '2020-01-12')
+        self.assertEqual(contract.wage_type, 'hourly')
+        self.assertEqual(payslip.wage_type, 'hourly')
+        cats = self._getCategories(payslip)
+        self.assertEqual(cats['BASIC'], hourly_wage * 80.0)

hr_payroll_hibou/views/hr_contract_views.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_contract_form_inherit" model="ir.ui.view">
+        <field name="name">hr.contract.form.inherit</field>
+        <field name="model">hr.contract</field>
+        <field name="priority">20</field>
+        <field name="inherit_id" ref="hr_payroll.hr_contract_form_inherit"/>
+        <field name="arch" type="xml">
+        <data>
+            <!-- existing field `wage_type` is now per-contract -->
+            <xpath expr="//group[@name='main_info_hourly']" position="attributes">
+                <attribute name="attrs">{}</attribute>
+            </xpath>
+            <xpath expr="//group[@name='salary_and_advantages']" position="attributes">
+                <attribute name="string">Period Advantages in Cash</attribute>
+            </xpath>
+        </data>
+        </field>
+    </record>
+
+</odoo>

hr_payroll_hibou/views/res_config_settings_views.xml

@@ -32,6 +32,7 @@
                                 <label for="module_l10n_us_hr_payroll_401k" string="USA Payroll 401k"/>
                                 <div class="text-muted">
                                     Provide retirement plans with optional company matching.
+                                    <strong>Hibou Professional</strong>
                                 </div>
                                 <div class="mt8" id="l10n_us_hr_payroll_401k_match">
                                     <button name="%(hr_payroll.hr_rule_parameter_action)d" icon="fa-arrow-right" type="action"
@@ -41,6 +42,30 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="col-lg-6 col-12 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="module_hr_payroll_attendance"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="module_hr_payroll_attendance"/>
+                                <div class="text-muted">
+                                    Extend Attendance into Payroll with Work Types, Overtime!
+                                    <strong>Hibou Professional</strong>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-lg-6 col-12 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="module_hr_payroll_timesheet"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="module_hr_payroll_timesheet"/>
+                                <div class="text-muted">
+                                    Extend Timesheets into Payroll with Work Types, Overtime!
+                                    <strong>Hibou Professional</strong>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </xpath>
             </field>

hr_payroll_overtime/__manifest__.py

@@ -9,11 +9,12 @@
     'data': [
         'security/ir.model.access.csv',
         'data/overtime_data.xml',
+        'views/hr_payslip_views.xml',
         'views/hr_work_entry_views.xml',
         'views/resource_calendar_views.xml',
     ],
     'depends': [
-        'hr_payroll',
+        'hr_payroll_hibou',
         'hr_work_entry',
     ],
 }

hr_payroll_overtime/models/hr_payslip.py

@@ -1,17 +1,54 @@
 from collections import defaultdict
-from odoo import models
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 
 
 class HRPayslip(models.Model):
     _inherit = 'hr.payslip'
 
-    def aggregate_overtime(self, work_data, day_week_start=None):
+    def _get_worked_day_lines_values(self, domain=None):
+        worked_day_lines_values = super()._get_worked_day_lines_values(domain=domain)
+        return self._process_worked_day_lines_values(worked_day_lines_values, domaian=domain)
+
+    def _process_worked_day_lines_values(self, worked_day_lines_values, domaian=None):
+        if not self.state in ('draft', 'verify'):
+            return worked_day_lines_values
+
+        worked_day_lines_values = self._filter_worked_day_lines_values(worked_day_lines_values)
+        work_data = self._pre_aggregate_work_data()
+        work_data = self._post_aggregate_work_data(work_data)
+        processed_data = self._aggregate_overtime(work_data)
+        worked_day_lines_values += [{
+            'number_of_days': data[0],
+            'number_of_hours': data[1],
+            'rate': data[2],
+            '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_values
+
+    def _filter_worked_day_lines_values(self, worked_day_lines_values):
+        # e.g. maybe you want to remove the stock 'WORK100' lines
+        # returns new worked_day_lines_values
+        return worked_day_lines_values
+
+    def _pre_aggregate_work_data(self):
+        # returns dict(iso_date: list(tuple(hr.work.entry.type(), hours, original_record))
+        return defaultdict(list)
+
+    def _post_aggregate_work_data(self, work_data):
+        # takes pre_aggregate data format and converts it.
+        # this is to simplify algorithm and guarantee ordered by iso_date semantics
+        # work_data: dict(iso_date: list(tuple(hr.work.entry.type(), hours, original_record))
+        # returns: list(tuple(iso_date, list(tuple(hr.work.entry.type(), hours, original_record))
+        return [(iso_date, work_data[iso_date]) for iso_date in sorted(work_data.keys())]
+
+    def _aggregate_overtime(self, work_data, day_week_start=None):
         """
 
         :param work_data: list(tuple(iso_date, list(tuple(hr.work.entry.type(), hours, original_record))
         :param day_week_start: day of the week to start (otherwise employee's resource calendar start day of week)
-        :return: dict(hr.work.entry.type(): list(days_worked, hours_worked, ))
+        :return: dict(hr.work.entry.type(): list(days_worked, hours_worked, rate))
         """
         if not day_week_start:
             if self.employee_id.resource_calendar_id.day_week_start:
@@ -105,3 +142,20 @@ class HRPayslip(models.Model):
             working_aggregation[work_type][1] += hours
             day_hours[iso_date] += hours
             week_hours[week] += hours
+
+
+class HrPayslipWorkedDays(models.Model):
+    _inherit = 'hr.payslip.worked_days'
+
+    rate = fields.Float(string='Rate', default=1.0)
+
+    @api.depends('is_paid', 'number_of_hours', 'payslip_id', 'payslip_id.normal_wage', 'payslip_id.sum_worked_hours', 'rate')
+    def _compute_amount(self):
+        for worked_days in self:
+            if not worked_days.contract_id:
+                worked_days.amount = 0
+                continue
+            if worked_days.payslip_id.wage_type == "hourly":
+                worked_days.amount = worked_days.payslip_id.contract_id._get_contract_wage(work_type=worked_days.work_entry_type_id) * worked_days.number_of_hours * worked_days.rate if worked_days.is_paid else 0
+            else:
+                worked_days.amount = worked_days.payslip_id.normal_wage * worked_days.number_of_hours / (worked_days.payslip_id.sum_worked_hours or 1) if worked_days.is_paid else 0

hr_payroll_overtime/tests/test_overtime.py

@@ -51,7 +51,7 @@ class TestOvertime(common.TransactionCase):
                 (self.work_type, 6.0, None),
             ]),
         ]
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertTrue(self.work_type_overtime not in result_data)
         self.assertEqual(result_data[self.work_type][0], 4)
@@ -63,7 +63,7 @@ class TestOvertime(common.TransactionCase):
                 (self.work_type, 10.0, None),
             ]),
         ]
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 5)
         self.assertEqual(result_data[self.work_type][1], 40.0)
@@ -77,7 +77,7 @@ class TestOvertime(common.TransactionCase):
                 (self.work_type, 4.0, None),
             ]),
         ]
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 5)
         self.assertEqual(result_data[self.work_type][1], 40.0)
@@ -110,7 +110,7 @@ class TestOvertime(common.TransactionCase):
             work_data.append(data)
             work_data.append(((data[0][0], data[0][1]+1, data[0][2]), data[1]))
 
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertTrue(self.work_type_overtime not in result_data)
         self.assertEqual(result_data[self.work_type][0], 8)
@@ -123,7 +123,7 @@ class TestOvertime(common.TransactionCase):
                 (self.work_type, 6.0, None),
             ]),
         ]
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 9)
         self.assertEqual(result_data[self.work_type][1], 78.0)
@@ -137,7 +137,7 @@ class TestOvertime(common.TransactionCase):
                 (self.work_type, 4.0, None),
             ]),
         ]
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 9)
         self.assertEqual(result_data[self.work_type][1], 78.0)
@@ -171,7 +171,7 @@ class TestOvertime(common.TransactionCase):
                 (self.work_type, 6.0, None),
             ]),
         ]
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 4)
         self.assertEqual(result_data[self.work_type][1], 32.0)
@@ -185,7 +185,7 @@ class TestOvertime(common.TransactionCase):
                 (self.work_type, 10.0, None),
             ]),
         ]
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 5)
         self.assertEqual(result_data[self.work_type][1], 40.0)
@@ -199,7 +199,7 @@ class TestOvertime(common.TransactionCase):
                 (self.work_type, 4.0, None),
             ]),
         ]
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 5)
         self.assertEqual(result_data[self.work_type][1], 40.0)
@@ -232,7 +232,7 @@ class TestOvertime(common.TransactionCase):
             work_data.append(data)
             work_data.append(((data[0][0], data[0][1]+1, data[0][2]), data[1]))
 
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertTrue(self.work_type_overtime in result_data)
         self.assertEqual(result_data[self.work_type][0], 8)
@@ -247,7 +247,7 @@ class TestOvertime(common.TransactionCase):
                 (self.work_type, 6.0, None),
             ]),
         ]
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 9)
         self.assertEqual(result_data[self.work_type][1], 70.0)
@@ -261,7 +261,7 @@ class TestOvertime(common.TransactionCase):
                 (self.work_type, 4.0, None),
             ]),
         ]
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 9)
         self.assertEqual(result_data[self.work_type][1], 70.0)
@@ -314,7 +314,7 @@ class TestOvertime(common.TransactionCase):
             ]),
         ]
 
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 4)
         self.assertEqual(result_data[self.work_type][1], 32.0)
@@ -342,7 +342,7 @@ class TestOvertime(common.TransactionCase):
         ]
 
         with self.assertRaises(UserError):
-            result_data = self.payslip.aggregate_overtime(work_data)
+            result_data = self.payslip._aggregate_overtime(work_data)
 
     def test_14_recursive_infinite_loop(self):
         # recursive will use a second overtime, but not this time!
@@ -361,7 +361,7 @@ class TestOvertime(common.TransactionCase):
         ]
 
         with self.assertRaises(UserError):
-            result_data = self.payslip.aggregate_overtime(work_data)
+            result_data = self.payslip._aggregate_overtime(work_data)
 
     def test_15_override_day_of_week(self):
         iso_date = (2020, 24, 1)
@@ -374,7 +374,7 @@ class TestOvertime(common.TransactionCase):
             ]),
         ]
 
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 1)
         self.assertEqual(result_data[self.work_type][1], 8.0)
@@ -393,7 +393,7 @@ class TestOvertime(common.TransactionCase):
                 'work_type_id': self.work_type_overtime.id,  # Note that this wouldn't be good in practice
             })]
         })
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 1)
         self.assertEqual(result_data[self.work_type][1], 8.0)
@@ -413,7 +413,7 @@ class TestOvertime(common.TransactionCase):
             ]),
         ]
 
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 1)
         self.assertEqual(result_data[self.work_type][1], 8.0)
@@ -432,7 +432,7 @@ class TestOvertime(common.TransactionCase):
             })]
         })
         self.overtime_rules.flush()
-        result_data = self.payslip.aggregate_overtime(work_data)
+        result_data = self.payslip._aggregate_overtime(work_data)
         self.assertTrue(self.work_type in result_data)
         self.assertEqual(result_data[self.work_type][0], 1)
         self.assertEqual(result_data[self.work_type][1], 8.0)

hr_payroll_overtime/views/hr_payslip_views.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <!-- Payslip Form -->
+    <record id="view_hr_payslip_form_inherit" model="ir.ui.view">
+        <field name="name">hr.payslip.form.inherit</field>
+        <field name="model">hr.payslip</field>
+        <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='worked_days_line_ids']/tree/field[@name='number_of_hours']" position="after">
+                <field name="rate"/>
+            </xpath>
+            <xpath expr="//field[@name='worked_days_line_ids']/form//field[@name='number_of_hours']" position="after">
+                <field name="rate"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

hr_payroll_timesheet/__init__.py

@@ -0,0 +1,15 @@
+from . import models
+
+
+def ts_payroll_pre_init_hook(cr):
+    """
+    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_OT")
+    then the uniqueness constraint will prevent this module
+    from installing.
+    """
+    cr.execute("UPDATE hr_work_entry_type "
+               "SET code = 'TS_OT-PRE-INSTALL' "
+               "WHERE code = 'TS_OT';"
+               )

hr_payroll_timesheet/__manifest__.py

@@ -0,0 +1,27 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'Timesheets on Payslips',
+    'description': 'Get Timesheet hours onto Employee Payslips.',
+    'version': '14.0.1.0.0',
+    'website': 'https://hibou.io/',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'license': 'OPL-1',
+    'category': 'Human Resources',
+    'data': [
+        '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_hibou',
+        'hr_timesheet_work_entry',
+        'hr_payroll_overtime',
+        'hibou_professional',
+    ],
+    'pre_init_hook': 'ts_payroll_pre_init_hook',
+}

hr_payroll_timesheet/data/hr_payroll_timesheet_data.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Work Entry Type -->
+    <record id="work_input_timesheet_overtime" model="hr.work.entry.type">
+        <field name="name">Timesheet Overtime</field>
+        <field name="code">TS_OT</field>
+    </record>
+
+    <record id="hr_timesheet_work_entry.work_input_timesheet" model="hr.work.entry.type">
+        <field name="overtime_type_id" ref="hr_payroll_overtime.work_entry_overtime_type"/>
+        <field name="overtime_work_type_id" ref="work_input_timesheet_overtime"/>
+    </record>
+
+</odoo>

hr_payroll_timesheet/data/hr_payroll_timesheet_demo.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- add overtime type+rules on internal demo type -->
+    <record id="hr_timesheet_work_entry.work_input_timesheet_internal" model="hr.work.entry.type">
+        <field name="overtime_type_id" ref="hr_payroll_overtime.work_entry_overtime_type"/>
+        <field name="overtime_work_type_id" ref="work_input_timesheet_overtime"/>
+    </record>
+
+</odoo>

hr_payroll_timesheet/models/__init__.py

@@ -0,0 +1,3 @@
+from . import account
+from . import hr_contract
+from . import hr_payslip

hr_payroll_timesheet/models/account.py

@@ -0,0 +1,34 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+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", 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)
+        ts_with_payslip.write({'payslip_id': False})
+        return super(AnalyticLine, self - ts_with_payslip).unlink()
+

hr_payroll_timesheet/models/hr_contract.py

@@ -0,0 +1,16 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+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'

hr_payroll_timesheet/models/hr_payslip.py

@@ -0,0 +1,73 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+
+
+class HrPayslip(models.Model):
+    _inherit = 'hr.payslip'
+
+    timesheet_ids = fields.One2many('account.analytic.line', 'payslip_id', string='Timesheets',
+                                     help='Timesheets represented by payslip.', readonly=True,
+                                     states={'draft': [('readonly', False)], 'verify': [('readonly', False)]})
+    timesheet_count = fields.Integer(compute='_compute_timesheet_count')
+
+    @api.depends('timesheet_ids', 'timesheet_ids.payslip_id')
+    def _compute_timesheet_count(self):
+        for payslip in self:
+            payslip.timesheet_count = len(payslip.timesheet_ids)
+
+    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 _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_type = self.env.ref('hr_timesheet_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
+                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
+
+    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()
+                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
+                work_data[ts_iso].append((timesheet_type, ts.unit_amount, ts))
+        return work_data
+
+    def action_open_timesheets(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            '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)],
+        }

hr_payroll_timesheet/tests/__init__.py

@@ -0,0 +1 @@
+from . import test_payslip_timesheet

hr_payroll_timesheet/tests/test_payslip_timesheet.py

@@ -0,0 +1,246 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo.addons.hr_payroll_hibou.tests import common
+from odoo.exceptions import ValidationError
+
+
+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._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.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)
+
+        # 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',
+        })
+
+        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,
+            'project_id': self.project.id,
+            'date': '2017-01-01',
+            'unit_amount': 5.0,
+            'name': 'test',
+            'payslip_id': self.payslip_dummy.id,
+        })
+
+        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.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, 2.0)
+        self.assertEqual(timesheet_line.number_of_hours, 18.0)
+        self.assertEqual(timesheet_line.amount, 18.0 * wage)
+
+        # Day 3
+        self.env['account.analytic.line'].create({
+            'employee_id': self.employee.id,
+            'project_id': self.project.id,
+            'date': '2018-01-03',
+            'unit_amount': 10.0,
+            'name': 'test',
+        })
+        # Day 4
+        self.env['account.analytic.line'].create({
+            'employee_id': self.employee.id,
+            'project_id': self.project.id,
+            'date': '2018-01-04',
+            'unit_amount': 10.0,
+            'name': 'test',
+        })
+        # Day 5
+        self.env['account.analytic.line'].create({
+            'employee_id': self.employee.id,
+            'project_id': self.project.id,
+            'date': '2018-01-05',
+            'unit_amount': 10.0,
+            'name': 'test',
+        })
+        # Day 6
+        self.env['account.analytic.line'].create({
+            'employee_id': self.employee.id,
+            'project_id': self.project.id,
+            'date': '2018-01-06',
+            'unit_amount': 4.0,
+            'name': 'test',
+        })
+
+        self.payslip.state = 'draft'
+        self.payslip._onchange_employee()
+        timesheet_line = self.payslip.worked_days_line_ids.filtered(lambda l: l.code == 'TS')
+        timesheet_overtime_line = self.payslip.worked_days_line_ids.filtered(lambda l: l.code == 'TS_OT')
+        self.assertTrue(timesheet_line)
+        self.assertEqual(timesheet_line.number_of_days, 5.0)
+        self.assertEqual(timesheet_line.number_of_hours, 40.0)
+        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,
+        })
+
+        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,
+            'project_id': self.project.id,
+            'date': '2017-01-01',
+            'unit_amount': 5.0,
+            'name': 'test',
+            'payslip_id': self.payslip_dummy.id,
+        })
+
+        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.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)
+
+
+    def test_with_leave(self):
+        date_from = '2020-01-10'
+        date_to = '2020-01-11'
+        self.env['resource.calendar.leaves'].create({
+            'name': 'Doctor Appointment',
+            'date_from': date_from,
+            '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',
+        })
+
+        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')
+        self.assertTrue(leave_line)
+        self.assertEqual(leave_line.number_of_days, 1.0)
+        self.assertEqual(leave_line.number_of_hours, 8.0)
+        self.assertEqual(leave_line.amount, 8.0 * self.test_hourly_wage)

hr_payroll_timesheet/views/hr_contract_view.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="hr_contract_form_inherit" model="ir.ui.view">
+        <field name="name">hr.contract.form.inherit</field>
+        <field name="model">hr.contract</field>
+        <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='wage_type']" position="after">
+                <field name="paid_hourly_timesheet"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

hr_payroll_timesheet/views/hr_payslip_views.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_payslip_view_form_inherit" model="ir.ui.view">
+        <field name="name">hr.payslip.view.form.inherit</field>
+        <field name="model">hr.payslip</field>
+        <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button class="oe_stat_button" name="action_open_timesheets" type="object" icon="fa-history" attrs="{'invisible': [('timesheet_count', '=', 0)]}">
+                    <field string="Timesheets" name="timesheet_count" widget="statinfo"/>
+                </button>
+            </xpath>
+            <xpath expr="//field[@name='number']" position="after">
+                <field name="timesheet_ids" invisible="1" widget="many2many"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

hr_payroll_timesheet/views/timesheet_views.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="hr_timesheet_line_tree_inherit" model="ir.ui.view">
+        <field name="name">account.analytic.line.tree.hr_timesheet.inherit</field>
+        <field name="model">account.analytic.line</field>
+        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//tree/field[@name='task_id']" position="after">
+                <field name="employee_id"/>
+                <field name="payslip_id"
+                       domain="[('employee_id', '=', employee_id)]" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="hr_timesheet_line_form_inherit" model="ir.ui.view">
+        <field name="name">account.analytic.line.form.inherit</field>
+        <field name="model">account.analytic.line</field>
+        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='task_id']" position="after">
+                <field name="employee_id"/>
+                <field name="payslip_id"
+                       domain="[('employee_id', '=', employee_id)]" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

hr_timesheet_work_entry/__init__.py

@@ -0,0 +1,15 @@
+from . import models
+
+
+def ts_work_type_pre_init_hook(cr):
+    """
+    This module installs a Work Entry Type with code "TS"
+    If you have undergone a migration (either for this module
+    or even your own Payslip Work Entry lines with code "TS")
+    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';"
+               )

hr_timesheet_work_entry/__manifest__.py

@@ -0,0 +1,22 @@
+{
+    'name': 'Timesheet Work Entry Type',
+    'description': 'Set work types on timesheet records.',
+    'version': '14.0.1.0.0',
+    'website': 'https://hibou.io/',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'license': 'AGPL-3',
+    'category': 'Human Resources',
+    'depends': [
+        'hr_timesheet',
+        'hr_work_entry',
+    ],
+    'data': [
+        'data/hr_timesheet_work_entry_data.xml',
+        'views/timesheet_views.xml',
+        'views/work_entry_views.xml',
+    ],
+    'demo': [
+        'data/hr_timesheet_work_entry_demo.xml',
+    ],
+    'pre_init_hook': 'ts_work_type_pre_init_hook',
+}

hr_timesheet_work_entry/data/hr_timesheet_work_entry_data.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="work_input_timesheet" model="hr.work.entry.type">
+        <field name="name">Timesheet</field>
+        <field name="code">TS</field>
+        <field name="allow_timesheet" eval="True"/>
+    </record>
+
+</odoo>

hr_timesheet_work_entry/data/hr_timesheet_work_entry_demo.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="work_input_timesheet_internal" model="hr.work.entry.type">
+        <field name="name">Internal</field>
+        <field name="code">TS_INTERNAL</field>
+        <field name="allow_timesheet" eval="True"/>
+    </record>
+
+</odoo>

hr_timesheet_work_entry/models/__init__.py

@@ -0,0 +1,2 @@
+from . import timesheet
+from . import work_entry

hr_timesheet_work_entry/models/timesheet.py

@@ -0,0 +1,9 @@
+from odoo import api, fields, models
+
+
+class AccountAnalyticLine(models.Model):
+    _inherit = 'account.analytic.line'
+
+    work_type_id = fields.Many2one('hr.work.entry.type', string='Work Type',
+                                   default=lambda self: self.env.ref('hr_timesheet_work_entry.work_input_timesheet',
+                                                                     raise_if_not_found=False))

hr_timesheet_work_entry/models/work_entry.py

@@ -0,0 +1,7 @@
+from odoo import fields, models
+
+
+class HrWorkEntryType(models.Model):
+    _inherit = 'hr.work.entry.type'
+
+    allow_timesheet = fields.Boolean(string='Allow on Timesheet')

hr_timesheet_work_entry/tests/__init__.py

@@ -0,0 +1 @@
+from . import test_timesheet_work_type

hr_timesheet_work_entry/tests/test_timesheet_work_type.py

@@ -0,0 +1,19 @@
+from odoo.tests import common
+
+
+class TestTimesheetWorkType(common.TransactionCase):
+    def setUp(self):
+        super().setUp()
+        self.employee = self.env.ref('hr.employee_hne')
+        self.project = self.env.ref('project.project_project_2')
+        self.default_work_type = self.env.ref('hr_timesheet_work_entry.work_input_timesheet')
+
+    def test_01_work_type(self):
+        timesheet = self.env['account.analytic.line'].create({
+            'name': '/',
+            'employee_id': self.employee.id,
+            'unit_amount': 1.0,
+            'project_id': self.project.id,
+        })
+        self.assertTrue(timesheet.work_type_id)
+        self.assertEqual(timesheet.work_type_id, self.default_work_type)

hr_timesheet_work_entry/views/timesheet_views.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="hr_timesheet_line_tree_inherit" model="ir.ui.view">
+        <field name="name">account.analytic.line.tree.hr_timesheet.inherit</field>
+        <field name="model">account.analytic.line</field>
+        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//tree/field[@name='task_id']" position="after">
+                <field name="work_type_id"
+                       domain="[('allow_timesheet', '=', True)]"
+                       context="{'default_allow_timesheet': True}" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="hr_timesheet_line_form_inherit" model="ir.ui.view">
+        <field name="name">account.analytic.line.form.inherit</field>
+        <field name="model">account.analytic.line</field>
+        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='task_id']" position="after">
+                <field name="work_type_id"
+                       domain="[('allow_timesheet', '=', True)]"
+                       context="{'default_allow_timesheet': True}" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

hr_timesheet_work_entry/views/work_entry_views.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="hr_work_entry_type_view_form_inherit" model="ir.ui.view">
+        <field name="name">hr.work.type.view.form.inherit</field>
+        <field name="model">hr.work.entry.type</field>
+        <field name="inherit_id" ref="hr_work_entry.hr_work_entry_type_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group/group" position="after">
+                <group name="timesheet" string="Timesheets">
+                    <field name="allow_timesheet"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+    <menuitem
+        id="hr_work_entry_type_menu"
+        name="Work Entry Types"
+        parent="hr_timesheet.hr_timesheet_menu_configuration"
+        action="hr_work_entry.hr_work_entry_type_action"/>
+
+</odoo>