mirror of
https://gitlab.com/hibou-io/hibou-odoo/suite.git
synced 2025-01-20 12:37:31 +02:00
[IMP] hr_payroll_overtime: implement exempt from overtime on contract
This commit is contained in:
@@ -9,6 +9,7 @@
|
|||||||
'data': [
|
'data': [
|
||||||
'security/ir.model.access.csv',
|
'security/ir.model.access.csv',
|
||||||
'data/overtime_data.xml',
|
'data/overtime_data.xml',
|
||||||
|
'views/hr_contract_views.xml',
|
||||||
'views/hr_payslip_views.xml',
|
'views/hr_payslip_views.xml',
|
||||||
'views/hr_work_entry_views.xml',
|
'views/hr_work_entry_views.xml',
|
||||||
'views/resource_calendar_views.xml',
|
'views/resource_calendar_views.xml',
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
from . import hr_contract
|
||||||
from . import hr_payslip
|
from . import hr_payslip
|
||||||
from . import hr_work_entry
|
from . import hr_work_entry
|
||||||
from . import resource_calendar
|
from . import resource_calendar
|
||||||
|
|||||||
8
hr_payroll_overtime/models/hr_contract.py
Normal file
8
hr_payroll_overtime/models/hr_contract.py
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
from odoo import fields, models
|
||||||
|
|
||||||
|
|
||||||
|
class HrContract(models.Model):
|
||||||
|
_inherit = 'hr.contract'
|
||||||
|
|
||||||
|
is_overtime_exempt = fields.Boolean(string='Overtime Exempt',
|
||||||
|
help='e.g. Agriculture or farm work exempt under the US FLSA.')
|
||||||
@@ -105,7 +105,7 @@ class HRPayslip(models.Model):
|
|||||||
working_aggregation[work_type][2] = multiplier
|
working_aggregation[work_type][2] = multiplier
|
||||||
|
|
||||||
week = iso_date[1]
|
week = iso_date[1]
|
||||||
if work_type.overtime_work_type_id and work_type.overtime_type_id:
|
if not self.contract_id.is_overtime_exempt and work_type.overtime_work_type_id and work_type.overtime_type_id:
|
||||||
ot_h_w = work_type.overtime_type_id.hours_per_week
|
ot_h_w = work_type.overtime_type_id.hours_per_week
|
||||||
ot_h_d = work_type.overtime_type_id.hours_per_day
|
ot_h_d = work_type.overtime_type_id.hours_per_day
|
||||||
|
|
||||||
|
|||||||
@@ -24,9 +24,11 @@ class TestOvertime(common.TransactionCase):
|
|||||||
'overtime_work_type_id': self.work_type_overtime.id,
|
'overtime_work_type_id': self.work_type_overtime.id,
|
||||||
})
|
})
|
||||||
self.employee = self.env.ref('hr.employee_hne')
|
self.employee = self.env.ref('hr.employee_hne')
|
||||||
|
self.contract = self.employee.contract_ids.filtered(lambda l: l.state == 'open')
|
||||||
self.payslip = self.env['hr.payslip'].create({
|
self.payslip = self.env['hr.payslip'].create({
|
||||||
'name': 'test slip',
|
'name': 'test slip',
|
||||||
'employee_id': self.employee.id,
|
'employee_id': self.employee.id,
|
||||||
|
'contract_id': self.contract.id,
|
||||||
'date_from': '2020-06-11',
|
'date_from': '2020-06-11',
|
||||||
'date_to': '2020-06-15',
|
'date_to': '2020-06-15',
|
||||||
})
|
})
|
||||||
@@ -490,3 +492,31 @@ class TestOvertime(common.TransactionCase):
|
|||||||
self.assertEqual(result_data[self.work_type_overtime][0], 1)
|
self.assertEqual(result_data[self.work_type_overtime][0], 1)
|
||||||
self.assertEqual(result_data[self.work_type_overtime][1], 4.0)
|
self.assertEqual(result_data[self.work_type_overtime][1], 4.0)
|
||||||
self.assertEqual(result_data[self.work_type_overtime][2], test_multiplier)
|
self.assertEqual(result_data[self.work_type_overtime][2], test_multiplier)
|
||||||
|
|
||||||
|
def test_19_overtime_exempt(self):
|
||||||
|
iso_date = (2020, 24, 1)
|
||||||
|
self.overtime_rules.hours_per_day = 8.0
|
||||||
|
work_data = [
|
||||||
|
(iso_date, [
|
||||||
|
(self.work_type, 4.0, None),
|
||||||
|
(self.work_type, 6.0, None),
|
||||||
|
]),
|
||||||
|
]
|
||||||
|
|
||||||
|
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)
|
||||||
|
self.assertTrue(self.work_type_overtime in result_data)
|
||||||
|
self.assertEqual(result_data[self.work_type_overtime][0], 0)
|
||||||
|
self.assertEqual(result_data[self.work_type_overtime][1], 2.0)
|
||||||
|
self.assertEqual(result_data[self.work_type_overtime][2], 1.5)
|
||||||
|
|
||||||
|
self.payslip.contract_id.is_overtime_exempt = True
|
||||||
|
self.assertTrue(self.payslip.contract_id)
|
||||||
|
self.assertTrue(self.payslip.contract_id.is_overtime_exempt)
|
||||||
|
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], 10.0)
|
||||||
|
self.assertTrue(self.work_type_overtime not in result_data)
|
||||||
|
|||||||
15
hr_payroll_overtime/views/hr_contract_views.xml
Normal file
15
hr_payroll_overtime/views/hr_contract_views.xml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<?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="is_overtime_exempt" />
|
||||||
|
</xpath>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
</odoo>
|
||||||
Reference in New Issue
Block a user