[FIX] hr_holidays: Fix time off calendar meetings
closes odoo/odoo#46762 Taskid: 2167996 Closes: #45292 X-original-commit: 163574641f7470f6bdc40e8aeafd055169305fb6 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
committed by
Yannick Tivisse
parent
bc836bac32
commit
e4130ddd97
@@ -109,6 +109,18 @@ msgstr ""
|
||||
msgid "%s on %s: %.2f hours on %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: hr_holidays
|
||||
#: code:addons/hr_holidays/models/hr_holidays.py:643
|
||||
#, python-format
|
||||
msgid "%s on Time Off : %.2f day(s)"
|
||||
msgstr "%s on Time Off : %.2f day(s)"
|
||||
|
||||
#. module: hr_holidays
|
||||
#: code:addons/hr_holidays/models/hr_leave.py:643
|
||||
#, python-format
|
||||
msgid "%s on Time Off : %.2f hour(s)"
|
||||
msgstr ""
|
||||
|
||||
#. module: hr_holidays
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
|
||||
msgid "</td>"
|
||||
|
||||
@@ -832,8 +832,12 @@ class HolidaysRequest(models.Model):
|
||||
def _prepare_holidays_meeting_values(self):
|
||||
self.ensure_one()
|
||||
calendar = self.employee_id.resource_calendar_id or self.env.company.resource_calendar_id
|
||||
if self.leave_type_request_unit == 'hour':
|
||||
meeting_name = _("%s on Time Off : %.2f hour(s)") % (self.employee_id.name or self.category_id.name, self.number_of_hours_display)
|
||||
else:
|
||||
meeting_name = _("%s on Time Off : %.2f day(s)") % (self.employee_id.name or self.category_id.name, self.number_of_days)
|
||||
meeting_values = {
|
||||
'name': self.display_name,
|
||||
'name': meeting_name,
|
||||
'duration': self.number_of_days * (calendar.hours_per_day or HOURS_PER_DAY),
|
||||
'description': self.notes,
|
||||
'user_id': self.user_id.id,
|
||||
|
||||
Reference in New Issue
Block a user