pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_holidays: time labels naming

Browse Source 
In a 12-hour clock:
- 00:30 is 12:30 AM
- 12:30 is 12:30 PM

opw-2374394

closes odoo/odoo#61321

X-original-commit: c25805189ea221cbcf1ef81ed9e250d14a3c1a80
Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
This commit is contained in:
Nicolas Martinelli
2020-11-04 12:13:32 +00:00
parent f2a1e74d08
commit a79e44efb0
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/i18n/hr_holidays.pot
+12
View File
@@ -234,6 +234,18 @@ msgstr ""
msgid "12:00 PM"
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields.selection,name:hr_holidays.selection__hr_leave__request_hour_from__0_5
#: model:ir.model.fields.selection,name:hr_holidays.selection__hr_leave__request_hour_to__0_5
msgid "12:30 AM"
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields.selection,name:hr_holidays.selection__hr_leave__request_hour_from__12_5
#: model:ir.model.fields.selection,name:hr_holidays.selection__hr_leave__request_hour_to__12_5
msgid "12:30 PM"
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields.selection,name:hr_holidays.selection__hr_leave__request_hour_from__1
#: model:ir.model.fields.selection,name:hr_holidays.selection__hr_leave__request_hour_to__1
addons/hr_holidays/models/hr_leave.py
+4 -4
View File
@@ -199,7 +199,7 @@ class HolidaysRequest(models.Model):
request_date_to = fields.Date('Request End Date')
# Interface fields used when using hour-based computation
request_hour_from = fields.Selection([
('0', '12:00 AM'), ('0.5', '0:30 AM'),
('0', '12:00 AM'), ('0.5', '12:30 AM'),
('1', '1:00 AM'), ('1.5', '1:30 AM'),
('2', '2:00 AM'), ('2.5', '2:30 AM'),
('3', '3:00 AM'), ('3.5', '3:30 AM'),
@@ -211,7 +211,7 @@ class HolidaysRequest(models.Model):
('9', '9:00 AM'), ('9.5', '9:30 AM'),
('10', '10:00 AM'), ('10.5', '10:30 AM'),
('11', '11:00 AM'), ('11.5', '11:30 AM'),
('12', '12:00 PM'), ('12.5', '0:30 PM'),
('12', '12:00 PM'), ('12.5', '12:30 PM'),
('13', '1:00 PM'), ('13.5', '1:30 PM'),
('14', '2:00 PM'), ('14.5', '2:30 PM'),
('15', '3:00 PM'), ('15.5', '3:30 PM'),
@@ -224,7 +224,7 @@ class HolidaysRequest(models.Model):
('22', '10:00 PM'), ('22.5', '10:30 PM'),
('23', '11:00 PM'), ('23.5', '11:30 PM')], string='Hour from')
request_hour_to = fields.Selection([
('0', '12:00 AM'), ('0.5', '0:30 AM'),
('0', '12:00 AM'), ('0.5', '12:30 AM'),
('1', '1:00 AM'), ('1.5', '1:30 AM'),
('2', '2:00 AM'), ('2.5', '2:30 AM'),
('3', '3:00 AM'), ('3.5', '3:30 AM'),
@@ -236,7 +236,7 @@ class HolidaysRequest(models.Model):
('9', '9:00 AM'), ('9.5', '9:30 AM'),
('10', '10:00 AM'), ('10.5', '10:30 AM'),
('11', '11:00 AM'), ('11.5', '11:30 AM'),
('12', '12:00 PM'), ('12.5', '0:30 PM'),
('12', '12:00 PM'), ('12.5', '12:30 PM'),
('13', '1:00 PM'), ('13.5', '1:30 PM'),
('14', '2:00 PM'), ('14.5', '2:30 PM'),
('15', '3:00 PM'), ('15.5', '3:30 PM'),