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

WIP Initial migration to 12.0 for hr_holidays_accrual, known to not work.

Browse Source
This commit is contained in:
Jared Kipe
2019-05-20 15:50:01 -07:00
parent a24b2fcb3a
commit dcde3ff5ce
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hr_holidays_accrual/models/hr_holidays.py
View File

@@ -2,7 +2,7 @@ from odoo import api, fields, models
class HRHolidays(models.Model): class HRHolidays(models.Model):
_inherit = 'hr.holidays' _inherit = 'hr.leave.type'
grant_by_tag = fields.Boolean(string="Grant by Tag") grant_by_tag = fields.Boolean(string="Grant by Tag")
@@ -19,7 +19,7 @@ class HRHolidays(models.Model):
} }
def accrue_for_employee(self, employee): def accrue_for_employee(self, employee):
holidays = self.env['hr.holidays'].sudo() holidays = self.env['hr.leave'].sudo()
for leave_to_create in self: for leave_to_create in self:
values = leave_to_create._accrue_for_employee_values(employee) values = leave_to_create._accrue_for_employee_values(employee)
if values: if values:
@@ -32,7 +32,7 @@ class HREmployee(models.Model):
@api.multi @api.multi
def write(self, values): def write(self, values):
holidays = self.env['hr.holidays'].sudo() holidays = self.env['hr.leave'].sudo()
for emp in self: for emp in self:
if values.get('category_ids'): if values.get('category_ids'):
categ_ids_command_list = values.get('category_ids') categ_ids_command_list = values.get('category_ids')

8
hr_holidays_accrual/tests/test_leaves.py
View File

@@ -9,11 +9,11 @@ class TestLeaves(TestHrHolidaysBase):
self.categ = self.env['hr.employee.category'].create({'name': 'Test Category'}) self.categ = self.env['hr.employee.category'].create({'name': 'Test Category'})
department = self.env['hr.department'].create({'name': 'Test Department'}) department = self.env['hr.department'].create({'name': 'Test Department'})
self.employee = self.env['hr.employee'].create({'name': 'Mark', 'department_id': department.id}) 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', 'name': 'Test Status',
'color_name': 'red', '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, 'holiday_status_id': self.leave_type.id,
'number_of_days_temp': 5, 'number_of_days_temp': 5,
'holiday_type': 'category', 'holiday_type': 'category',
@@ -29,7 +29,7 @@ class TestLeaves(TestHrHolidaysBase):
self.assertEqual(self.employee.leaves_count, 0.0) self.assertEqual(self.employee.leaves_count, 0.0)
self.employee.write({'category_ids': [(6, False, [self.categ.id])]}) self.employee.write({'category_ids': [(6, False, [self.categ.id])]})
self.assertEqual(self.employee.leaves_count, 5.0) 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) self.assertEqual(leave.holiday_status_id.id, self.leave_type.id)
def test_double_validation(self): def test_double_validation(self):
@@ -38,6 +38,6 @@ class TestLeaves(TestHrHolidaysBase):
self.test_leave.action_approve() self.test_leave.action_approve()
self.test_leave.action_validate() self.test_leave.action_validate()
self.employee.write({'category_ids': [(6, False, [self.categ.id])]}) 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.state, 'validate1')
self.assertEqual(leave.first_approver_id.id, self.env.uid) self.assertEqual(leave.first_approver_id.id, self.env.uid)

4
hr_holidays_accrual/views/hr_holidays_views.xml
View File

@@ -2,8 +2,8 @@
<odoo> <odoo>
<record id="hr_holidays_edit_holiday_new_inherit" model="ir.ui.view"> <record id="hr_holidays_edit_holiday_new_inherit" model="ir.ui.view">
<field name="name">hr.holidays.edit.holiday.new.inherit</field> <field name="name">hr.holidays.edit.holiday.new.inherit</field>
<field name="model">hr.holidays</field> <field name="model">hr.leave.type</field>
<field name="inherit_id" ref="hr_holidays.edit_holiday_new"/> <field name="inherit_id" ref="hr_holidays.edit_holiday_status_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//group/group[2]" position="after"> <xpath expr="//group/group[2]" position="after">
<group name="accrue" attrs="{'invisible': [('type', '!=', 'add')]}"> <group name="accrue" attrs="{'invisible': [('type', '!=', 'add')]}">