Skip to content
Snippets Groups Projects
Commit 4da71296 authored by Swapnesh Shah's avatar Swapnesh Shah Committed by Yannick Tivisse
Browse files

[FIX] hr_holidays: correct date format on leave name


Before this Commit, dates was not formatted based on user's language.

With this commit, we use format_date to correctly format dates.

closes odoo/odoo#108365

X-original-commit: f6f23f3156ccd2b8d36f6608f96ad9985818da54
Signed-off-by: default avatarYannick Tivisse (yti) <yti@odoo.com>
parent 1ea082b9
No related branches found
No related tags found
No related merge requests found
......@@ -16,7 +16,7 @@ from odoo import api, Command, fields, models, tools
from odoo.addons.base.models.res_partner import _tz_get
from odoo.addons.resource.models.resource import float_to_time, HOURS_PER_DAY
from odoo.exceptions import AccessError, UserError, ValidationError
from odoo.tools import float_compare
from odoo.tools import float_compare, format_date
from odoo.tools.float_utils import float_round
from odoo.tools.misc import format_date
from odoo.tools.translate import _
......@@ -807,6 +807,7 @@ class HolidaysRequest(models.Model):
target = leave.employee_id.name
else:
target = ', '.join(leave.employee_ids.mapped('name'))
display_date = format_date(self.env, date_from_utc) or ""
if leave.leave_type_request_unit == 'hour':
if self.env.context.get('hide_employee_name') and 'employee_id' in self.env.context.get('group_by', []):
res.append((
......@@ -815,7 +816,7 @@ class HolidaysRequest(models.Model):
person=target,
leave_type=leave.holiday_status_id.name,
duration=leave.number_of_hours_display,
date=fields.Date.to_string(date_from_utc) or "",
date=display_date,
)
))
else:
......@@ -825,13 +826,13 @@ class HolidaysRequest(models.Model):
person=target,
leave_type=leave.holiday_status_id.name,
duration=leave.number_of_hours_display,
date=fields.Date.to_string(date_from_utc) or "",
date=display_date,
)
))
else:
display_date = fields.Date.to_string(date_from_utc) or ""
if leave.number_of_days > 1 and date_from_utc and date_to_utc:
display_date += ' / %s' % fields.Date.to_string(date_to_utc) or ""
display_date += ' / %s' % format_date(self.env, date_to_utc) or ""
if not target or self.env.context.get('hide_employee_name') and 'employee_id' in self.env.context.get('group_by', []):
res.append((
leave.id,
......
......@@ -6,6 +6,7 @@ from odoo.addons.hr_work_entry_holidays.tests.common import TestWorkEntryHoliday
from odoo.tests.common import users, warmup, tagged
@tagged('work_entry_perf')
class TestWorkEntryHolidaysPerformance(TestWorkEntryHolidaysBase):
@classmethod
......@@ -47,7 +48,7 @@ class TestWorkEntryHolidaysPerformance(TestWorkEntryHolidaysBase):
@users('__system__', 'admin')
@warmup
def test_performance_leave_create(self):
with self.assertQueryCount(__system__=28, admin=29): # 25/26 com
with self.assertQueryCount(__system__=31, admin=32): # 25/26 com
leave = self.create_leave(datetime(2018, 1, 1, 7, 0), datetime(2018, 1, 1, 18, 0))
leave.action_refuse()
......@@ -56,7 +57,7 @@ class TestWorkEntryHolidaysPerformance(TestWorkEntryHolidaysBase):
def test_performance_leave_confirm(self):
leave = self.create_leave(datetime(2018, 1, 1, 7, 0), datetime(2018, 1, 1, 18, 0))
leave.action_draft()
with self.assertQueryCount(__system__=25, admin=26):
with self.assertQueryCount(__system__=28, admin=29):
leave.action_confirm()
leave.state = 'refuse'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment