From 999043b36c123972cb10dd1c55ce71a3cc981f85 Mon Sep 17 00:00:00 2001 From: niyasraphy Date: Thu, 8 Dec 2022 12:52:06 +0000 Subject: [PATCH] [IMP] *: change leave string's to time off update various string/labels contains "Leave" in hr_holidays, hr_work_entry_contract, resource, test_resource and project_timesheet_holidays modules to "Time Off" closes odoo/odoo#107504 Signed-off-by: Yannick Tivisse (yti) --- addons/hr_holidays/data/hr_holidays_data.xml | 2 +- addons/hr_holidays/data/hr_holidays_demo.xml | 2 +- addons/hr_holidays/models/hr_leave.py | 4 +- .../hr_holidays/models/hr_leave_allocation.py | 2 +- addons/hr_holidays/models/hr_leave_type.py | 2 +- addons/hr_holidays/models/resource.py | 4 +- .../report/hr_leave_employee_type_report.py | 2 +- addons/hr_holidays/report/hr_leave_report.py | 4 +- .../security/hr_holidays_security.xml | 2 +- .../hr_holidays/tests/test_access_rights.py | 44 +++++++++---------- .../hr_holidays/tests/test_company_leave.py | 32 +++++++------- .../hr_holidays/tests/test_global_leaves.py | 14 +++--- .../tests/test_hr_holidays_cancel_leave.py | 4 +- .../hr_holidays/tests/test_leave_requests.py | 4 +- addons/hr_holidays/views/hr_views.xml | 6 +-- .../hr_holidays/wizard/hr_departure_wizard.py | 2 +- .../wizard/hr_holidays_cancel_leave.py | 5 +-- addons/hr_work_entry_contract/tests/common.py | 4 +- .../models/account_analytic.py | 2 +- .../models/project_task.py | 2 +- .../tests/test_timesheet_holidays.py | 14 +++--- addons/resource/views/resource_views.xml | 6 +-- addons/test_resource/tests/test_resource.py | 6 +-- 23 files changed, 84 insertions(+), 85 deletions(-) diff --git a/addons/hr_holidays/data/hr_holidays_data.xml b/addons/hr_holidays/data/hr_holidays_data.xml index 37d00ba0fe1..f50089606e0 100644 --- a/addons/hr_holidays/data/hr_holidays_data.xml +++ b/addons/hr_holidays/data/hr_holidays_data.xml @@ -290,7 +290,7 @@ 4 - + Unpaid no diff --git a/addons/hr_holidays/data/hr_holidays_demo.xml b/addons/hr_holidays/data/hr_holidays_demo.xml index d67036e688a..b6ee5595449 100644 --- a/addons/hr_holidays/data/hr_holidays_demo.xml +++ b/addons/hr_holidays/data/hr_holidays_demo.xml @@ -6,7 +6,7 @@ - + Parental Leaves yes diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index 3a42938a0e4..fe742a8e51a 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -35,7 +35,7 @@ def get_employee_from_context(values, context, user_employee_id): return employee_id_value or context.get('default_employee_id', context.get('employee_id', user_employee_id)) class HolidaysRequest(models.Model): - """ Leave Requests Access specifications + """ Time Off Requests Access specifications - a regular employee / user - can see all leaves; @@ -1454,7 +1454,7 @@ class HolidaysRequest(models.Model): raise UserError(_('You must either be a Time off Officer or Time off Manager to approve this leave')) ################################################### - # Leave modification methods + # Time Off modification methods ################################################### def _split_leave_on_gto(self, gto): #gto = global time off diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py index 4f691077cb6..09140f722ee 100644 --- a/addons/hr_holidays/models/hr_leave_allocation.py +++ b/addons/hr_holidays/models/hr_leave_allocation.py @@ -134,7 +134,7 @@ class HolidaysAllocation(models.Model): is_officer = fields.Boolean(compute='_compute_is_officer') accrual_plan_id = fields.Many2one('hr.leave.accrual.plan', compute="_compute_from_holiday_status_id", store=True, readonly=False, domain="['|', ('time_off_type_id', '=', False), ('time_off_type_id', '=', holiday_status_id)]", tracking=True) max_leaves = fields.Float(compute='_compute_leaves') - leaves_taken = fields.Float(compute='_compute_leaves') + leaves_taken = fields.Float(compute='_compute_leaves', string='Time off Taken') taken_leave_ids = fields.One2many('hr.leave', 'holiday_allocation_id', domain="[('state', 'in', ['confirm', 'validate1', 'validate'])]") _sql_constraints = [ diff --git a/addons/hr_holidays/models/hr_leave_type.py b/addons/hr_holidays/models/hr_leave_type.py index d4ee70386a4..127a717277b 100644 --- a/addons/hr_holidays/models/hr_leave_type.py +++ b/addons/hr_holidays/models/hr_leave_type.py @@ -68,7 +68,7 @@ class HolidaysType(models.Model): ('no_validation', 'No Validation'), ('hr', 'By Time Off Officer'), ('manager', "By Employee's Approver"), - ('both', "By Employee's Approver and Time Off Officer")], default='hr', string='Leave Validation') + ('both', "By Employee's Approver and Time Off Officer")], default='hr', string='Time Off Validation') requires_allocation = fields.Selection([ ('yes', 'Yes'), ('no', 'No Limit')], default="yes", required=True, string='Requires allocation', diff --git a/addons/hr_holidays/models/resource.py b/addons/hr_holidays/models/resource.py index 9cb072b27bf..40c5ee3b7df 100644 --- a/addons/hr_holidays/models/resource.py +++ b/addons/hr_holidays/models/resource.py @@ -8,7 +8,7 @@ from odoo.osv import expression class CalendarLeaves(models.Model): _inherit = "resource.calendar.leaves" - holiday_id = fields.Many2one("hr.leave", string='Leave Request') + holiday_id = fields.Many2one("hr.leave", string='Time Off Request') @api.constrains('date_from', 'date_to', 'calendar_id') def _check_compare_dates(self): @@ -105,7 +105,7 @@ class CalendarLeaves(models.Model): class ResourceCalendar(models.Model): _inherit = "resource.calendar" - associated_leaves_count = fields.Integer("Leave Count", compute='_compute_associated_leaves_count') + associated_leaves_count = fields.Integer("Time Off Count", compute='_compute_associated_leaves_count') def _compute_associated_leaves_count(self): leaves_read_group = self.env['resource.calendar.leaves'].read_group( diff --git a/addons/hr_holidays/report/hr_leave_employee_type_report.py b/addons/hr_holidays/report/hr_leave_employee_type_report.py index 1117a69031f..50aded7efd1 100644 --- a/addons/hr_holidays/report/hr_leave_employee_type_report.py +++ b/addons/hr_holidays/report/hr_leave_employee_type_report.py @@ -14,7 +14,7 @@ class LeaveReport(models.Model): active_employee = fields.Boolean(readonly=True) number_of_days = fields.Float('Number of Days', readonly=True, group_operator="sum") department_id = fields.Many2one('hr.department', string='Department', readonly=True) - leave_type = fields.Many2one("hr.leave.type", string="Leave Type", readonly=True) + leave_type = fields.Many2one("hr.leave.type", string="Time Off Type", readonly=True) holiday_status = fields.Selection([ ('taken', 'Taken'), #taken = validated ('left', 'Left'), diff --git a/addons/hr_holidays/report/hr_leave_report.py b/addons/hr_holidays/report/hr_leave_report.py index ca4b81e9ce1..d5f9cc273e1 100644 --- a/addons/hr_holidays/report/hr_leave_report.py +++ b/addons/hr_holidays/report/hr_leave_report.py @@ -13,7 +13,7 @@ class LeaveReport(models.Model): active = fields.Boolean(readonly=True) employee_id = fields.Many2one('hr.employee', string="Employee", readonly=True) - leave_id = fields.Many2one('hr.leave', string="Leave Request", readonly=True) + leave_id = fields.Many2one('hr.leave', string="Time Off Request", readonly=True) allocation_id = fields.Many2one('hr.leave.allocation', string="Allocation Request", readonly=True) active_employee = fields.Boolean(readonly=True) name = fields.Char('Description', readonly=True) @@ -24,7 +24,7 @@ class LeaveReport(models.Model): ], string='Request Type', readonly=True) department_id = fields.Many2one('hr.department', string='Department', readonly=True) category_id = fields.Many2one('hr.employee.category', string='Employee Tag', readonly=True) - holiday_status_id = fields.Many2one("hr.leave.type", string="Leave Type", readonly=True) + holiday_status_id = fields.Many2one("hr.leave.type", string="Time Off Type", readonly=True) state = fields.Selection([ ('draft', 'To Submit'), ('cancel', 'Cancelled'), diff --git a/addons/hr_holidays/security/hr_holidays_security.xml b/addons/hr_holidays/security/hr_holidays_security.xml index f22cb8b72d1..9db8f430145 100644 --- a/addons/hr_holidays/security/hr_holidays_security.xml +++ b/addons/hr_holidays/security/hr_holidays_security.xml @@ -139,7 +139,7 @@ - Leave Allocations: multi company global rule + Time Off: multi company global rule ['|', ('holiday_status_id.company_id', '=', False), ('holiday_status_id.company_id', 'in', company_ids)] diff --git a/addons/hr_holidays/tests/test_access_rights.py b/addons/hr_holidays/tests/test_access_rights.py index ba078033cf4..b3e9e338c7d 100644 --- a/addons/hr_holidays/tests/test_access_rights.py +++ b/addons/hr_holidays/tests/test_access_rights.py @@ -119,7 +119,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_emp.id, 'holiday_status_id': status.id, } @@ -133,7 +133,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hruser.id, 'holiday_status_id': status.id, } @@ -150,7 +150,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): self.employee_hruser.write({'leave_manager_id': self.user_employee.id}) for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hruser.id, 'holiday_status_id': status.id, } @@ -167,7 +167,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): self.employee_emp.write({'leave_manager_id': self.user_employee.id}) for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_emp.id, 'holiday_status_id': status.id, } @@ -180,7 +180,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_emp.id, 'holiday_status_id': status.id, } @@ -195,7 +195,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_emp.id, 'holiday_status_id': status.id, } @@ -210,7 +210,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hruser.id, 'holiday_status_id': status.id, } @@ -224,7 +224,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_emp.id, 'holiday_status_id': status.id, } @@ -241,7 +241,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): self.employee_emp.write({'leave_manager_id': self.user_hruser.id}) for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_emp.id, 'holiday_status_id': status.id, } @@ -258,7 +258,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): self.employee_hruser.write({'leave_manager_id': self.user_hruser.id}) for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hruser.id, 'holiday_status_id': status.id, } @@ -271,7 +271,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hruser.id, 'holiday_status_id': status.id, } @@ -286,7 +286,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hruser.id, 'holiday_status_id': status.id, } @@ -300,7 +300,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hrmanager.id, 'holiday_status_id': status.id, } @@ -313,7 +313,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hruser.id, 'holiday_status_id': status.id, } @@ -327,7 +327,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): self.employee_hruser.write({'leave_manager_id': self.user_hrmanager.id}) for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hruser.id, 'holiday_status_id': status.id, } @@ -341,7 +341,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): self.employee_hrmanager.write({'leave_manager_id': self.user_hrmanager.id}) for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hrmanager.id, 'holiday_status_id': status.id, } @@ -354,7 +354,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hruser.id, 'holiday_status_id': status.id, } @@ -368,7 +368,7 @@ class TestAcessRightsStates(TestHrHolidaysAccessRightsCommon): """ for i, status in enumerate(self.draft_status): values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_hruser.id, 'holiday_status_id': status.id, } @@ -721,7 +721,7 @@ class TestAccessRightsUnlink(TestHrHolidaysAccessRightsCommon): def test_leave_unlink_draft_by_user(self): """ A simple user may delete its leave in draft state in the future""" values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_emp.id, 'holiday_status_id': self.leave_type.id, 'state': 'draft', @@ -732,7 +732,7 @@ class TestAccessRightsUnlink(TestHrHolidaysAccessRightsCommon): def test_leave_unlink_confirm_by_user(self): """ A simple user may delete its leave in confirm state in the future""" values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_emp.id, 'holiday_status_id': self.leave_type.id, 'state': 'confirm', @@ -743,7 +743,7 @@ class TestAccessRightsUnlink(TestHrHolidaysAccessRightsCommon): def test_leave_unlink_confirm_in_past_by_user(self): """ A simple user cannot delete its leave in the past""" values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_emp.id, 'holiday_status_id': self.leave_type.id, 'state': 'confirm', @@ -755,7 +755,7 @@ class TestAccessRightsUnlink(TestHrHolidaysAccessRightsCommon): def test_leave_unlink_validate_by_user(self): """ A simple user cannot delete its leave in validate state""" values = { - 'name': 'Random Leave', + 'name': 'Random Time Off', 'employee_id': self.employee_emp.id, 'holiday_status_id': self.leave_type.id, } diff --git a/addons/hr_holidays/tests/test_company_leave.py b/addons/hr_holidays/tests/test_company_leave.py index 77b7904cd5c..4f1b7dce92b 100644 --- a/addons/hr_holidays/tests/test_company_leave.py +++ b/addons/hr_holidays/tests/test_company_leave.py @@ -70,19 +70,19 @@ class TestCompanyLeave(TransactionCase): all_leaves = self.env['hr.leave'].search([('employee_id', '=', self.employee.id)], order='id') self.assertEqual(len(all_leaves), 4) - # Original Leave + # Original Time Off self.assertEqual(leave.state, 'refuse') - # before leave + # Before Time Off self.assertEqual(all_leaves[1].date_from, datetime(2020, 1, 7, 7, 0)) self.assertEqual(all_leaves[1].date_to, datetime(2020, 1, 7, 16, 0)) self.assertEqual(all_leaves[1].number_of_days, 1) self.assertEqual(all_leaves[1].state, 'confirm') - # After leave + # After Time Off self.assertEqual(all_leaves[2].date_from, datetime(2020, 1, 9, 7, 0)) self.assertEqual(all_leaves[2].date_to, datetime(2020, 1, 9, 16, 0)) self.assertEqual(all_leaves[2].number_of_days, 1) self.assertEqual(all_leaves[2].state, 'confirm') - # Company Leave + # Company Time Off self.assertEqual(all_leaves[3].date_from, datetime(2020, 1, 8, 7, 0)) self.assertEqual(all_leaves[3].date_to, datetime(2020, 1, 8, 16, 0)) self.assertEqual(all_leaves[3].number_of_days, 1) @@ -124,26 +124,26 @@ class TestCompanyLeave(TransactionCase): all_leaves = self.env['hr.leave'].search([('employee_id', '=', self.employee.id)], order='id') self.assertEqual(len(all_leaves), 4) - # Original Leave + # Original Time Off self.assertEqual(leave.state, 'refuse') - # before leave + # Before Time Off self.assertEqual(all_leaves[1].date_from, datetime(2020, 1, 7, 7, 0)) self.assertEqual(all_leaves[1].date_to, datetime(2020, 1, 7, 16, 0)) self.assertEqual(all_leaves[1].number_of_days, 1) self.assertEqual(all_leaves[1].state, 'confirm') - # After leave + # After Time Off self.assertEqual(all_leaves[2].date_from, datetime(2020, 1, 9, 7, 0)) self.assertEqual(all_leaves[2].date_to, datetime(2020, 1, 9, 16, 0)) self.assertEqual(all_leaves[2].number_of_days, 1) self.assertEqual(all_leaves[2].state, 'confirm') - # Company Leave + # Company Time Off self.assertEqual(all_leaves[3].date_from, datetime(2020, 1, 8, 7, 0)) self.assertEqual(all_leaves[3].date_to, datetime(2020, 1, 8, 16, 0)) self.assertEqual(all_leaves[3].number_of_days, 1) self.assertEqual(all_leaves[3].state, 'validate') def test_leave_whole_company_03(self): - # TEST CASE 3: Leaves taken in half-days. Take a 0.5 days leave + # TEST CASE 3: Time Off taken in half-days. Take a 0.5 days leave # Add a company leave on the same day # Check that leave refused self.paid_time_off.request_unit = 'half_day' @@ -180,9 +180,9 @@ class TestCompanyLeave(TransactionCase): all_leaves = self.env['hr.leave'].search([('employee_id', '=', self.employee.id)], order='id') self.assertEqual(len(all_leaves), 2) - # Original Leave + # Original Time Off self.assertEqual(leave.state, 'refuse') - # Company Leave + # Company Time Off self.assertEqual(all_leaves[1].date_from, datetime(2020, 1, 7, 7, 0)) self.assertEqual(all_leaves[1].date_to, datetime(2020, 1, 7, 16, 0)) self.assertEqual(all_leaves[1].number_of_days, 1) @@ -224,9 +224,9 @@ class TestCompanyLeave(TransactionCase): all_leaves = self.env['hr.leave'].search([('employee_id', '=', self.employee.id)], order='id') self.assertEqual(len(all_leaves), 2) - # Original Leave + # Original Time Off self.assertEqual(leave.state, 'refuse') - # Company Leave + # Company Time Off self.assertEqual(all_leaves[1].date_from, datetime(2020, 1, 9, 7, 0)) self.assertEqual(all_leaves[1].date_to, datetime(2020, 1, 9, 16, 0)) self.assertEqual(all_leaves[1].number_of_days, 1) @@ -275,14 +275,14 @@ class TestCompanyLeave(TransactionCase): all_leaves = self.env['hr.leave'].search([('employee_id', '=', self.employee.id)], order='id') self.assertEqual(len(all_leaves), 3) - # Original Leave + # Original Time Off self.assertEqual(leave.state, 'refuse') - # before leave + # Before Time Off self.assertEqual(all_leaves[1].date_from, datetime(2020, 1, 6, 7, 0)) self.assertEqual(all_leaves[1].date_to, datetime(2020, 1, 9, 16, 0)) self.assertEqual(all_leaves[1].number_of_days, 2) self.assertEqual(all_leaves[1].state, 'confirm') - # Company Leave + # Company Time Off self.assertEqual(all_leaves[2].date_from, datetime(2020, 1, 10, 7, 0)) self.assertEqual(all_leaves[2].date_to, datetime(2020, 1, 10, 16, 0)) self.assertEqual(all_leaves[2].number_of_days, 1) diff --git a/addons/hr_holidays/tests/test_global_leaves.py b/addons/hr_holidays/tests/test_global_leaves.py index fc57e085560..09ee427455c 100644 --- a/addons/hr_holidays/tests/test_global_leaves.py +++ b/addons/hr_holidays/tests/test_global_leaves.py @@ -46,13 +46,13 @@ class TestGlobalLeaves(TestHrHolidaysCommon): }) cls.global_leave = cls.env['resource.calendar.leaves'].create({ - 'name': 'Global Leave', + 'name': 'Global Time Off', 'date_from': date(2022, 3, 7), 'date_to': date(2022, 3, 7), }) cls.calendar_leave = cls.env['resource.calendar.leaves'].create({ - 'name': 'Global Leave', + 'name': 'Global Time Off', 'date_from': date(2022, 3, 8), 'date_to': date(2022, 3, 8), 'calendar_id': cls.calendar_1.id, @@ -61,7 +61,7 @@ class TestGlobalLeaves(TestHrHolidaysCommon): def test_leave_on_global_leave(self): with self.assertRaises(ValidationError): self.env['resource.calendar.leaves'].create({ - 'name': 'Wrong Leave', + 'name': 'Wrong Time Off', 'date_from': date(2022, 3, 7), 'date_to': date(2022, 3, 7), 'calendar_id': self.calendar_1.id, @@ -69,14 +69,14 @@ class TestGlobalLeaves(TestHrHolidaysCommon): with self.assertRaises(ValidationError): self.env['resource.calendar.leaves'].create({ - 'name': 'Wrong Leave', + 'name': 'Wrong Time Off', 'date_from': date(2022, 3, 7), 'date_to': date(2022, 3, 7), }) def test_leave_on_calendar_leave(self): self.env['resource.calendar.leaves'].create({ - 'name': 'Correct Leave', + 'name': 'Correct Time Off', 'date_from': date(2022, 3, 8), 'date_to': date(2022, 3, 8), 'calendar_id': self.calendar_2.id, @@ -84,14 +84,14 @@ class TestGlobalLeaves(TestHrHolidaysCommon): with self.assertRaises(ValidationError): self.env['resource.calendar.leaves'].create({ - 'name': 'Wrong Leave', + 'name': 'Wrong Time Off', 'date_from': date(2022, 3, 8), 'date_to': date(2022, 3, 8), }) with self.assertRaises(ValidationError): self.env['resource.calendar.leaves'].create({ - 'name': 'Wrong Leave', + 'name': 'Wrong Time Off', 'date_from': date(2022, 3, 8), 'date_to': date(2022, 3, 8), 'calendar_id': self.calendar_1.id, diff --git a/addons/hr_holidays/tests/test_hr_holidays_cancel_leave.py b/addons/hr_holidays/tests/test_hr_holidays_cancel_leave.py index cc9a897c2af..2f4f4eb8826 100644 --- a/addons/hr_holidays/tests/test_hr_holidays_cancel_leave.py +++ b/addons/hr_holidays/tests/test_hr_holidays_cancel_leave.py @@ -19,11 +19,11 @@ class TestHrHolidaysCancelLeave(TestHrHolidaysCommon): leave_end_datetime = leave_start_datetime + relativedelta(days=3) cls.hr_leave_type = cls.env['hr.leave.type'].with_user(cls.user_hrmanager).create({ - 'name': 'Leave Type', + 'name': 'Time Off Type', 'requires_allocation': 'no', }) cls.holiday = cls.env['hr.leave'].with_context(mail_create_nolog=True, mail_notrack=True).with_user(cls.user_employee).create({ - 'name': 'Leave 1', + 'name': 'Time Off 1', 'employee_id': cls.employee_emp.id, 'holiday_status_id': cls.hr_leave_type.id, 'date_from': leave_start_datetime, diff --git a/addons/hr_holidays/tests/test_leave_requests.py b/addons/hr_holidays/tests/test_leave_requests.py index 94db0ab8264..fa68ea0ab91 100644 --- a/addons/hr_holidays/tests/test_leave_requests.py +++ b/addons/hr_holidays/tests/test_leave_requests.py @@ -201,7 +201,7 @@ class TestLeaveRequests(TestHrHolidaysCommon): leave = leave_form.save() leave.action_approve() member_ids = self.hr_dept.member_ids.ids - self.assertEqual(self.env['hr.leave'].search_count([('employee_id', 'in', member_ids)]), len(member_ids), "Leave should be created for members of department") + self.assertEqual(self.env['hr.leave'].search_count([('employee_id', 'in', member_ids)]), len(member_ids), "Time Off should be created for members of department") @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail') def test_allocation_request(self): @@ -414,7 +414,7 @@ class TestLeaveRequests(TestHrHolidaysCommon): (0, 0, {'name': 'Friday Afternoon', 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}) ], 'global_leave_ids': [(0, 0, { - 'name': 'Christmas Leave', + 'name': 'Christmas Time Off', 'date_from': fields.Datetime.from_string('2019-12-25 00:00:00'), 'date_to': fields.Datetime.from_string('2019-12-26 23:59:59'), 'resource_id': False, diff --git a/addons/hr_holidays/views/hr_views.xml b/addons/hr_holidays/views/hr_views.xml index 52d6fbe9beb..3aa5b5db31f 100644 --- a/addons/hr_holidays/views/hr_views.xml +++ b/addons/hr_holidays/views/hr_views.xml @@ -105,7 +105,7 @@
- +
@@ -138,7 +138,7 @@
- +
@@ -167,7 +167,7 @@