audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

MIG hr_payroll_timesheet_holidays to 12.0

Browse Source
This commit is contained in:
Jared Kipe
2019-03-12 11:51:29 -07:00
parent 003699c7d7
commit e5d3ab590f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hr_payroll_timesheet_holidays/__manifest__.py
View File

@@ -1,7 +1,7 @@
{ {
'name': 'Payroll Timesheet Holidays', 'name': 'Payroll Timesheet Holidays',
'author': 'Hibou Corp. <hello@hibou.io>', 'author': 'Hibou Corp. <hello@hibou.io>',
'version': '11.0.1.0.0', 'version': '12.0.1.0.0',
'category': 'Human Resources', 'category': 'Human Resources',
'sequence': 95, 'sequence': 95,
'summary': 'Holiday Pay', 'summary': 'Holiday Pay',

14
hr_payroll_timesheet_holidays/hr_payslip.py
View File

@@ -1,5 +1,5 @@
from odoo import models, api 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): 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): 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) leave_code = self._create_leave_code(leave.holiday_status_id.name)
if leave_code in leaves: if leave_code in leaves:
leaves[leave_code]['number_of_days'] += leave.number_of_days_temp leaves[leave_code]['number_of_days'] += leave.number_of_days
leaves[leave_code]['number_of_hours'] += leave.number_of_days_temp * HOURS_PER_DAY leaves[leave_code]['number_of_hours'] += leave.number_of_days * HOURS_PER_DAY
else: else:
leaves[leave_code] = { leaves[leave_code] = {
'name': leave.holiday_status_id.name, 'name': leave.holiday_status_id.name,
'sequence': 15, 'sequence': 15,
'code': leave_code, 'code': leave_code,
'number_of_days': leave.number_of_days_temp, 'number_of_days': leave.number_of_days,
'number_of_hours': leave.number_of_days_temp * HOURS_PER_DAY, 'number_of_hours': leave.number_of_days * HOURS_PER_DAY,
'contract_id': contract.id, 'contract_id': contract.id,
} }
@@ -43,10 +43,10 @@ class HrPayslip(models.Model):
('date_from', '>=', date_from), ('date_from', '>=', date_from),
('date_from', '<=', date_to), ('date_from', '<=', date_to),
('payslip_status', '=', False), ('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): def _create_leave_code(self, name):
return 'L_' + name.replace(' ', '_') return 'L_' + name.replace(' ', '_')