From e502423f2b9376885a7c8443f13ab1f209ff3f3a Mon Sep 17 00:00:00 2001 From: Cas Vissers Date: Mon, 29 Oct 2018 13:53:51 +0000 Subject: [PATCH] [FIX] resource: Rename 'Evening' into 'Afternoon' in default attendances Evening is not the common way to describe the second shift of the day. Closes #28253 Co-authored-by: Cas Vissers closes odoo/odoo#28950 --- addons/resource/data/resource_data.xml | 20 ++++++++++---------- addons/resource/models/resource.py | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/addons/resource/data/resource_data.xml b/addons/resource/data/resource_data.xml index 1390e0bd518..7bcefb03774 100644 --- a/addons/resource/data/resource_data.xml +++ b/addons/resource/data/resource_data.xml @@ -28,15 +28,15 @@ @@ -48,15 +48,15 @@ diff --git a/addons/resource/models/resource.py b/addons/resource/models/resource.py index 481cb9b57df..742eac7cee7 100644 --- a/addons/resource/models/resource.py +++ b/addons/resource/models/resource.py @@ -155,15 +155,15 @@ class ResourceCalendar(models.Model): def _get_default_attendance_ids(self): return [ (0, 0, {'name': _('Monday Morning'), 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}), - (0, 0, {'name': _('Monday Evening'), 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}), + (0, 0, {'name': _('Monday Afternoon'), 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}), (0, 0, {'name': _('Tuesday Morning'), 'dayofweek': '1', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}), - (0, 0, {'name': _('Tuesday Evening'), 'dayofweek': '1', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}), + (0, 0, {'name': _('Tuesday Afternoon'), 'dayofweek': '1', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}), (0, 0, {'name': _('Wednesday Morning'), 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}), - (0, 0, {'name': _('Wednesday Evening'), 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}), + (0, 0, {'name': _('Wednesday Afternoon'), 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}), (0, 0, {'name': _('Thursday Morning'), 'dayofweek': '3', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}), - (0, 0, {'name': _('Thursday Evening'), 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}), + (0, 0, {'name': _('Thursday Afternoon'), 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}), (0, 0, {'name': _('Friday Morning'), 'dayofweek': '4', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}), - (0, 0, {'name': _('Friday Evening'), 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}) + (0, 0, {'name': _('Friday Afternoon'), 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}) ] name = fields.Char(required=True)