diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml index a35ebfc6e11..37d07689174 100644 --- a/addons/hr/views/hr_employee_views.xml +++ b/addons/hr/views/hr_employee_views.xml @@ -116,7 +116,7 @@ options='{"always_reload": True, "highlight_first_line": True}'/> - + @@ -198,7 +198,10 @@ - Application Settings + 0 diff --git a/addons/hr_holidays/models/hr_employee.py b/addons/hr_holidays/models/hr_employee.py index f8f3e85e15d..a525f031c52 100644 --- a/addons/hr_holidays/models/hr_employee.py +++ b/addons/hr_holidays/models/hr_employee.py @@ -86,8 +86,7 @@ class HrEmployeeBase(models.AbstractModel): ('holiday_status_id.active', '=', True), ('holiday_status_id.requires_allocation', '=', 'yes'), ('state', '=', 'validate'), - '|', - ('date_to', '=', False), + ('date_from', '<=', current_date), ('date_to', '>=', current_date), ], ['number_of_days:sum', 'employee_id'], ['employee_id']) rg_results = dict((d['employee_id'][0], {"employee_id_count": d['employee_id_count'], "number_of_days": d['number_of_days']}) for d in data) diff --git a/addons/hr_hourly_cost/views/hr_employee_views.xml b/addons/hr_hourly_cost/views/hr_employee_views.xml index 289bedc6c6e..01dba7bf289 100644 --- a/addons/hr_hourly_cost/views/hr_employee_views.xml +++ b/addons/hr_hourly_cost/views/hr_employee_views.xml @@ -7,7 +7,7 @@ - Application Settings + 0