[FIX] hr_holidays: fix displaying negative allocations

When the attendance app is installed and the extra hours option is
enabled, it could happend that we have an allocation with negative
virtual_remaining_leaves, however it does not make sense to display it
to the user.
This commit filters out that possibility from showing on the dashboard.
This commit also fixes a display mismatch between extra hours and other
time off types.

TaskId-2655689

closes odoo/odoo#78295

X-original-commit: c943b55237447ad58a994602e58702c952ac019d
Signed-off-by: Kevin Baptiste <kba@odoo.com>
Signed-off-by: William Braeckman (wbr) <Williambraecky@users.noreply.github.com>
This commit is contained in:
William Braeckman
2021-10-13 12:30:57 +00:00
parent 4542e1f540
commit 7529e4a15d
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -293,7 +293,7 @@ class HolidaysType(models.Model):
@api.model
def get_days_all_request(self):
leave_types = sorted(self.search([]).filtered(lambda x: ((x.virtual_remaining_leaves or x.max_leaves))), key=self._model_sorting_key, reverse=True)
leave_types = sorted(self.search([]).filtered(lambda x: ((x.virtual_remaining_leaves > 0 or x.max_leaves))), key=self._model_sorting_key, reverse=True)
return [lt._get_days_request() for lt in leave_types]
def _get_days_request(self):
@@ -9,7 +9,7 @@
<img height="30px" t-attf-src="{{timeoff[1]['icon']}}"/>
</t>
<span t-esc="timeoff[1]['virtual_remaining_leaves']" class="o_timeoff_huge o_timeoff_purple font-weight-bold align-middle"/><br/>
<span class="o_timeoff_big o_timeoff_purple">HOURS AVAILABLE</span>
<span class="o_timeoff_purple">HOURS AVAILABLE</span>
</t>
</xpath>
<!--change t-if to t-elif-->