From e3fa264d1053e0f0a5181da56f205cc05cc06316 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Mon, 3 Feb 2020 09:59:59 +0000 Subject: [PATCH] [IMP] hr_holidays: improve display name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before this commit, the date range was not known without open the record in backend. It is really painfull to don't know when a guy of your team ping you on a new leave the date from the current leave. (today ? next week ? ...) Now we have the date into the name_get and so the subject of the email. task-2001439 Nothing related to next activity ;) but idea was the same. closes odoo/odoo#44462 Signed-off-by: Jérémy Kersten (jke) --- addons/hr_holidays/models/hr_leave.py | 31 ++++++++++++++++++--------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index 38b1d2a7636..637aababa62 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -593,17 +593,28 @@ class HolidaysRequest(models.Model): else: target = leave.employee_id.name if leave.leave_type_request_unit == 'hour': - res.append( - (leave.id, - _("%s on %s : %.2f hours") % - (target, leave.holiday_status_id.name, leave.number_of_hours_display)) - ) + res.append(( + leave.id, + _("%s on %s: %.2f hours on %s") % ( + target, + leave.holiday_status_id.name, + leave.number_of_hours_display, + fields.Date.to_string(leave.date_from), + ) + )) else: - res.append( - (leave.id, - _("%s on %s: %.2f days") % - (target, leave.holiday_status_id.name, leave.number_of_days)) - ) + display_date = fields.Date.to_string(leave.date_from) + if leave.number_of_days > 1: + display_date += ' ⇨ %s' % fields.Date.to_string(leave.date_to) + res.append(( + leave.id, + _("%s on %s: %.2f days (%s)") % ( + target, + leave.holiday_status_id.name, + leave.number_of_days, + display_date, + ) + )) return res def add_follower(self, employee_id):