From dcde3ff5ce55364f33c7cbb604f4af7aece1f355 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 20 May 2019 15:50:01 -0700 Subject: [PATCH] WIP Initial migration to 12.0 for `hr_holidays_accrual`, known to not work. --- hr_holidays_accrual/models/hr_holidays.py | 6 +++--- hr_holidays_accrual/tests/test_leaves.py | 8 ++++---- hr_holidays_accrual/views/hr_holidays_views.xml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hr_holidays_accrual/models/hr_holidays.py b/hr_holidays_accrual/models/hr_holidays.py index cbb7e3ac..606eda93 100644 --- a/hr_holidays_accrual/models/hr_holidays.py +++ b/hr_holidays_accrual/models/hr_holidays.py @@ -2,7 +2,7 @@ from odoo import api, fields, models class HRHolidays(models.Model): - _inherit = 'hr.holidays' + _inherit = 'hr.leave.type' grant_by_tag = fields.Boolean(string="Grant by Tag") @@ -19,7 +19,7 @@ class HRHolidays(models.Model): } def accrue_for_employee(self, employee): - holidays = self.env['hr.holidays'].sudo() + holidays = self.env['hr.leave'].sudo() for leave_to_create in self: values = leave_to_create._accrue_for_employee_values(employee) if values: @@ -32,7 +32,7 @@ class HREmployee(models.Model): @api.multi def write(self, values): - holidays = self.env['hr.holidays'].sudo() + holidays = self.env['hr.leave'].sudo() for emp in self: if values.get('category_ids'): categ_ids_command_list = values.get('category_ids') diff --git a/hr_holidays_accrual/tests/test_leaves.py b/hr_holidays_accrual/tests/test_leaves.py index 1fc9de93..44e44e4c 100644 --- a/hr_holidays_accrual/tests/test_leaves.py +++ b/hr_holidays_accrual/tests/test_leaves.py @@ -9,11 +9,11 @@ class TestLeaves(TestHrHolidaysBase): self.categ = self.env['hr.employee.category'].create({'name': 'Test Category'}) department = self.env['hr.department'].create({'name': 'Test Department'}) self.employee = self.env['hr.employee'].create({'name': 'Mark', 'department_id': department.id}) - self.leave_type = self.env['hr.holidays.status'].create({ + self.leave_type = self.env['hr.leave.type'].create({ 'name': 'Test Status', 'color_name': 'red', }) - self.test_leave = self.env['hr.holidays'].create({ + self.test_leave = self.env['hr.leave'].create({ 'holiday_status_id': self.leave_type.id, 'number_of_days_temp': 5, 'holiday_type': 'category', @@ -29,7 +29,7 @@ class TestLeaves(TestHrHolidaysBase): self.assertEqual(self.employee.leaves_count, 0.0) self.employee.write({'category_ids': [(6, False, [self.categ.id])]}) self.assertEqual(self.employee.leaves_count, 5.0) - leave = self.env['hr.holidays'].search([('employee_id', '=', self.employee.id)]) + leave = self.env['hr.leave'].search([('employee_id', '=', self.employee.id)]) self.assertEqual(leave.holiday_status_id.id, self.leave_type.id) def test_double_validation(self): @@ -38,6 +38,6 @@ class TestLeaves(TestHrHolidaysBase): self.test_leave.action_approve() self.test_leave.action_validate() self.employee.write({'category_ids': [(6, False, [self.categ.id])]}) - leave = self.env['hr.holidays'].search([('employee_id', '=', self.employee.id)]) + leave = self.env['hr.leave'].search([('employee_id', '=', self.employee.id)]) self.assertEqual(leave.state, 'validate1') self.assertEqual(leave.first_approver_id.id, self.env.uid) diff --git a/hr_holidays_accrual/views/hr_holidays_views.xml b/hr_holidays_accrual/views/hr_holidays_views.xml index a2cbed87..ec1b50e2 100644 --- a/hr_holidays_accrual/views/hr_holidays_views.xml +++ b/hr_holidays_accrual/views/hr_holidays_views.xml @@ -2,8 +2,8 @@ hr.holidays.edit.holiday.new.inherit - hr.holidays - + hr.leave.type +