Merge PR #694 into 12.0

Signed-off-by pedrobaeza
OCA · Oct 4, 2019 · d747ad1 · d747ad1
2 parents 6bf5b28 + 831aa38
commit d747ad1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hr_holidays_public/__manifest__.py b/hr_holidays_public/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'HR Holidays Public',
-    'version': '12.0.1.0.1',
+    'version': '12.0.1.0.2',
     'license': 'AGPL-3',
     'category': 'Human Resources',
     'author': "Michael Telahun Makonnen, "

diff --git a/hr_holidays_public/models/hr_holidays_public.py b/hr_holidays_public/models/hr_holidays_public.py
@@ -93,7 +93,7 @@ def get_holidays_list(self, year, employee_id=None):
                 holidays_filter.append(('country_id', '=', False))
         pholidays = self.search(holidays_filter)
         if not pholidays:
-            return list()
+            return self.env['hr.holidays.public.line']
 
         states_filter = [('year_id', 'in', pholidays.ids)]
         if employee and employee.address_id and employee.address_id.state_id: