mirror of
https://gitlab.com/hibou-io/hibou-odoo/suite.git
synced 2025-01-20 12:37:31 +02:00
Deliberately not setting company_id in hr_payroll_rate
This is intended to make instances of 'hr_payroll_rate' more like configuration for the modules that create them. Additional test and sorting makes it possible to 'prefer' to have company set to allow effectively per-company overrides.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{
|
||||
'name': 'Payroll Rates',
|
||||
'description': 'Payroll Rates',
|
||||
'version': '11.0.1.0.0',
|
||||
'version': '11.0.1.0.1',
|
||||
'website': 'https://hibou.io/',
|
||||
'author': 'Hibou Corp. <hello@hibou.io>',
|
||||
'license': 'AGPL-3',
|
||||
|
||||
@@ -10,7 +10,7 @@ class PayrollRate(models.Model):
|
||||
date_from = fields.Date(string='Date From', required=True)
|
||||
date_to = fields.Date(string='Date To')
|
||||
company_id = fields.Many2one('res.company', string='Company', copy=False,
|
||||
default=lambda self: self.env['res.company']._company_default_get())
|
||||
default=False)
|
||||
rate = fields.Float(string='Rate', required=True)
|
||||
code = fields.Char(string='Code', required=True)
|
||||
|
||||
@@ -34,4 +34,4 @@ class Payslip(models.Model):
|
||||
def get_rate(self, code):
|
||||
self.ensure_one()
|
||||
return self.env['hr.payroll.rate'].search(
|
||||
self._get_rate_domain(code), limit=1, order='date_from DESC')
|
||||
self._get_rate_domain(code), limit=1, order='date_from DESC, company_id ASC')
|
||||
|
||||
@@ -64,6 +64,16 @@ class TestPayrollRate(common.TransactionCase):
|
||||
rate = self.payslip.get_rate('TEST')
|
||||
self.assertEqual(rate, test_rate)
|
||||
|
||||
test_rate_more_specific = self.env['hr.payroll.rate'].create({
|
||||
'name': 'Test Rate Specific',
|
||||
'code': 'TEST',
|
||||
'rate': 1.65,
|
||||
'date_from': '2018-01-01',
|
||||
'company_id': self.payslip.company_id.id,
|
||||
})
|
||||
rate = self.payslip.get_rate('TEST')
|
||||
self.assertEqual(rate, test_rate_more_specific)
|
||||
|
||||
def test_payroll_rate_newer(self):
|
||||
test_rate_old = self.env['hr.payroll.rate'].create({
|
||||
'name': 'Test Rate',
|
||||
|
||||
Reference in New Issue
Block a user