-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_attendance/models/hr_employee.py b/addons/hr_attendance/models/hr_employee.py
index b6cda81db99..fb425e7e84c 100644
--- a/addons/hr_attendance/models/hr_employee.py
+++ b/addons/hr_attendance/models/hr_employee.py
@@ -205,6 +205,5 @@ class HrEmployee(models.Model):
def _compute_presence_icon(self):
res = super()._compute_presence_icon()
# All employee must chek in or check out. Everybody must have an icon
- employee_to_define = self.filtered(lambda e: e.hr_icon_display == 'presence_undetermined')
- employee_to_define.hr_icon_display = 'presence_to_define'
+ self.filtered(lambda employee: not employee.show_hr_icon_display).show_hr_icon_display = True
return res
diff --git a/addons/hr_holidays/models/hr_employee.py b/addons/hr_holidays/models/hr_employee.py
index 30ca3b6ad18..9e37af20df4 100644
--- a/addons/hr_holidays/models/hr_employee.py
+++ b/addons/hr_holidays/models/hr_employee.py
@@ -121,11 +121,11 @@ class HrEmployeeBase(models.AbstractModel):
def _compute_presence_icon(self):
super()._compute_presence_icon()
employees_absent = self.filtered(lambda employee:
- employee.hr_icon_display not in ['presence_present', 'presence_absent_active']
+ employee.hr_presence_state != 'present'
and employee.is_absent)
employees_absent.update({'hr_icon_display': 'presence_holiday_absent'})
employees_present = self.filtered(lambda employee:
- employee.hr_icon_display in ['presence_present', 'presence_absent_active']
+ employee.hr_presence_state == 'present'
and employee.is_absent)
employees_present.update({'hr_icon_display': 'presence_holiday_present'})
diff --git a/addons/hr_holidays/views/hr_views.xml b/addons/hr_holidays/views/hr_views.xml
index 9c3364495ef..69f84380d2f 100644
--- a/addons/hr_holidays/views/hr_views.xml
+++ b/addons/hr_holidays/views/hr_views.xml
@@ -91,7 +91,8 @@
-
+