Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[12.0][FIX] hr_holiday_public: Fix method return for concatenation #694

Merged
merged 1 commit into from
Oct 4, 2019
Merged

[12.0][FIX] hr_holiday_public: Fix method return for concatenation #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion hr_holidays_public/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, "
Expand Down
2 changes: 1 addition & 1 deletion hr_holidays_public/models/hr_holidays_public.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down