From 793fe22f8ad5b8beea10d36ad38222ed3c9de61f Mon Sep 17 00:00:00 2001
From: Arnaud Joset <arj@odoo.com>
Date: Tue, 16 Feb 2021 14:07:38 +0100
Subject: [PATCH] [IMP] hr_work_entry_contract,hr_work_entry_holidays: cleaning
style
Before this commit, the imported module would trigger some runbot warnings.
taskid: 2222790
---
addons/hr_work_entry_contract/models/hr_contract.py | 5 ++---
addons/hr_work_entry_contract/models/hr_work_entry.py | 2 --
addons/hr_work_entry_contract/models/hr_work_intervals.py | 1 -
addons/hr_work_entry_holidays/models/hr_leave.py | 2 +-
addons/hr_work_entry_holidays/models/hr_work_entry.py | 2 +-
addons/hr_work_entry_holidays/tests/common.py | 1 +
.../hr_work_entry_holidays/tests/test_multi_contract.py | 8 ++++----
.../tests/test_payslip_holidays_computation.py | 8 ++++----
addons/hr_work_entry_holidays/tests/test_performance.py | 2 --
addons/hr_work_entry_holidays/tests/test_work_entry.py | 2 +-
10 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/addons/hr_work_entry_contract/models/hr_contract.py b/addons/hr_work_entry_contract/models/hr_contract.py
index 8e42f377931f..7b733ef283b4 100644
--- a/addons/hr_work_entry_contract/models/hr_contract.py
+++ b/addons/hr_work_entry_contract/models/hr_contract.py
@@ -2,9 +2,8 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from collections import defaultdict
-from datetime import date, datetime
-from odoo import api, fields, models
-from odoo.addons.resource.models.resource_mixin import timezone_datetime
+from datetime import datetime
+from odoo import fields, models
from odoo.addons.resource.models.resource import datetime_to_string, string_to_datetime, Intervals
from odoo.osv import expression
diff --git a/addons/hr_work_entry_contract/models/hr_work_entry.py b/addons/hr_work_entry_contract/models/hr_work_entry.py
index 878c2ff30c7a..1e6c70b50ba2 100644
--- a/addons/hr_work_entry_contract/models/hr_work_entry.py
+++ b/addons/hr_work_entry_contract/models/hr_work_entry.py
@@ -4,9 +4,7 @@
import pytz
from collections import defaultdict
-from contextlib import contextmanager
from itertools import chain
-from dateutil.relativedelta import relativedelta
from odoo import api, fields, models, _
from odoo.exceptions import ValidationError
diff --git a/addons/hr_work_entry_contract/models/hr_work_intervals.py b/addons/hr_work_entry_contract/models/hr_work_intervals.py
index 22cd43ce87b9..5a934f93e909 100644
--- a/addons/hr_work_entry_contract/models/hr_work_intervals.py
+++ b/addons/hr_work_entry_contract/models/hr_work_intervals.py
@@ -95,4 +95,3 @@ class WorkIntervals(object):
enabled = not enabled
return result
-
diff --git a/addons/hr_work_entry_holidays/models/hr_leave.py b/addons/hr_work_entry_holidays/models/hr_leave.py
index 07348d8adfa6..08f7fef5b628 100644
--- a/addons/hr_work_entry_holidays/models/hr_leave.py
+++ b/addons/hr_work_entry_holidays/models/hr_leave.py
@@ -183,7 +183,7 @@ class HrLeave(models.Model):
return res
def _get_number_of_days(self, date_from, date_to, employee_id):
- """ If an employee is currently working full time but requests a leave next month
+ """ If an employee is currently working full time but asks for time off next month
where he has a new contract working only 3 days/week. This should be taken into
account when computing the number of days for the leave (2 weeks leave = 6 days).
Override this method to get number of days according to the contract's calendar
diff --git a/addons/hr_work_entry_holidays/models/hr_work_entry.py b/addons/hr_work_entry_holidays/models/hr_work_entry.py
index 558a8e246699..87add98f8ae6 100644
--- a/addons/hr_work_entry_holidays/models/hr_work_entry.py
+++ b/addons/hr_work_entry_holidays/models/hr_work_entry.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import api, fields, models
+from odoo import fields, models
class HrWorkEntry(models.Model):
diff --git a/addons/hr_work_entry_holidays/tests/common.py b/addons/hr_work_entry_holidays/tests/common.py
index f7b4bf181f81..082670d04f48 100644
--- a/addons/hr_work_entry_holidays/tests/common.py
+++ b/addons/hr_work_entry_holidays/tests/common.py
@@ -75,6 +75,7 @@ class TestWorkEntryHolidaysBase(TestWorkEntryBase):
'date_generated_to': datetime.strptime('2015-11-15', '%Y-%m-%d'),
})
+ @classmethod
def create_leave(cls, date_from=None, date_to=None):
date_from = date_from or Datetime.today()
date_to = date_to or Datetime.today() + relativedelta(days=1)
diff --git a/addons/hr_work_entry_holidays/tests/test_multi_contract.py b/addons/hr_work_entry_holidays/tests/test_multi_contract.py
index a098e1b087b4..06eadd455177 100644
--- a/addons/hr_work_entry_holidays/tests/test_multi_contract.py
+++ b/addons/hr_work_entry_holidays/tests/test_multi_contract.py
@@ -8,14 +8,14 @@ from odoo.addons.hr_work_entry_holidays.tests.common import TestWorkEntryHoliday
class TestWorkEntryHolidaysMultiContract(TestWorkEntryHolidaysBase):
- def setUp(cls):
- super(TestWorkEntryHolidaysMultiContract, cls).setUp()
- cls.leave_type = cls.env['hr.leave.type'].create({
+ def setUp(self):
+ super().setUp()
+ self.leave_type = self.env['hr.leave.type'].create({
'name': 'Legal Leaves',
'time_type': 'leave',
'allocation_type': 'no',
'validity_start': False,
- 'work_entry_type_id': cls.work_entry_type_leave.id
+ 'work_entry_type_id': self.work_entry_type_leave.id
})
def create_leave(self, start, end):
diff --git a/addons/hr_work_entry_holidays/tests/test_payslip_holidays_computation.py b/addons/hr_work_entry_holidays/tests/test_payslip_holidays_computation.py
index 577f2fe63132..96362495c0e7 100644
--- a/addons/hr_work_entry_holidays/tests/test_payslip_holidays_computation.py
+++ b/addons/hr_work_entry_holidays/tests/test_payslip_holidays_computation.py
@@ -8,15 +8,15 @@ from odoo.addons.hr_work_entry_holidays.tests.common import TestWorkEntryHoliday
class TestPayslipHolidaysComputation(TestWorkEntryHolidaysBase):
- def setUp(cls):
- super(TestPayslipHolidaysComputation, cls).setUp()
+ def setUp(self):
+ super().setUp()
- cls.leave_type = cls.env['hr.leave.type'].create({
+ self.leave_type = self.env['hr.leave.type'].create({
'name': 'Legal Leaves',
'time_type': 'leave',
'allocation_type': 'no',
'validity_start': False,
- 'work_entry_type_id': cls.work_entry_type_leave.id
+ 'work_entry_type_id': self.work_entry_type_leave.id
})
def test_work_data(self):
diff --git a/addons/hr_work_entry_holidays/tests/test_performance.py b/addons/hr_work_entry_holidays/tests/test_performance.py
index 7421d9d29b7e..0c8e00860505 100644
--- a/addons/hr_work_entry_holidays/tests/test_performance.py
+++ b/addons/hr_work_entry_holidays/tests/test_performance.py
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from datetime import date, datetime
-from dateutil.relativedelta import relativedelta
-from odoo import fields
from odoo.addons.hr_work_entry_holidays.tests.common import TestWorkEntryHolidaysBase
from odoo.tests.common import users, warmup, tagged
diff --git a/addons/hr_work_entry_holidays/tests/test_work_entry.py b/addons/hr_work_entry_holidays/tests/test_work_entry.py
index 66648486261f..56403c695872 100644
--- a/addons/hr_work_entry_holidays/tests/test_work_entry.py
+++ b/addons/hr_work_entry_holidays/tests/test_work_entry.py
@@ -112,7 +112,7 @@ class TestWorkeEntryHolidaysWorkEntry(TestWorkEntryHolidaysBase):
'company_id': company.id,
})
- contract = self.env['hr.contract'].create({
+ self.env['hr.contract'].create({
'name': 'Employee Contract',
'employee_id': employee.id,
'date_start': Date.from_string('2015-01-01'),
--
GitLab