diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py index 3fca9e400c4..e797a82d456 100644 --- a/addons/hr_holidays/models/hr_leave_allocation.py +++ b/addons/hr_holidays/models/hr_leave_allocation.py @@ -391,7 +391,7 @@ class HolidaysAllocation(models.Model): today = fields.Date.today() if vstop < today: - raise ValidationError(_('You can allocate %s only before %s') % (allocation.holiday_status_id.display_name, allocation.holiday_status_id.validity_stop)) + raise ValidationError(_('You can allocate %s only before %s.') % (allocation.holiday_status_id.display_name, allocation.holiday_status_id.validity_stop)) @api.model def create(self, values): diff --git a/addons/hr_holidays/models/hr_leave_type.py b/addons/hr_holidays/models/hr_leave_type.py index a377ca42379..73e018023eb 100644 --- a/addons/hr_holidays/models/hr_leave_type.py +++ b/addons/hr_holidays/models/hr_leave_type.py @@ -241,7 +241,7 @@ class HolidaysType(models.Model): 'max_leaves': ('%.2f' % lt.max_leaves).rstrip('0').rstrip('.'), 'leaves_taken': ('%.2f' % lt.leaves_taken).rstrip('0').rstrip('.'), 'request_unit': lt.request_unit, - }, lt.allocation_type) + }, lt.allocation_type, lt.validity_stop) for lt in leave_types] def _get_contextual_employee_id(self): diff --git a/addons/hr_holidays/static/src/xml/time_off_calendar.xml b/addons/hr_holidays/static/src/xml/time_off_calendar.xml index 72a50649062..31c1bf4f2e8 100644 --- a/addons/hr_holidays/static/src/xml/time_off_calendar.xml +++ b/addons/hr_holidays/static/src/xml/time_off_calendar.xml @@ -22,7 +22,10 @@ - remaining + + remaining + (Expire on ) +