Skip to content

Commit

Permalink
fixup! hr_holidays_public: Deprecate use of employee_id in favour of …
Browse files Browse the repository at this point in the history
…partner_id
  • Loading branch information
grindtildeath committed Feb 21, 2024
1 parent 0dacfff commit df2cf31
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions hr_holidays_public/models/hr_holidays_public.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def _get_domain_states_filter(
partner = self._get_partner_deprecated_employee(partner_id, employee_id)

states_filter = [("year_id", "in", pholidays.ids)]
if partner.state_id:
if partner and partner.state_id:
states_filter += [
"|",
("state_ids", "=", False),
Expand Down Expand Up @@ -91,18 +91,19 @@ def get_holidays_list(
end_dt = datetime.date(year, 12, 31)
years = list(range(start_dt.year, end_dt.year + 1))
holidays_filter = [("year", "in", years)]
if partner.country_id:
holidays_filter.append("|")
holidays_filter.append(("country_id", "=", False))
holidays_filter.append(("country_id", "=", partner.country_id.id))
else:
holidays_filter.append(("country_id", "=", False))
if partner:
if partner.country_id:
holidays_filter.append("|")
holidays_filter.append(("country_id", "=", False))
holidays_filter.append(("country_id", "=", partner.country_id.id))
else:
holidays_filter.append(("country_id", "=", False))
pholidays = self.search(holidays_filter)
if not pholidays:
return self.env["hr.holidays.public.line"]

partner_id = partner.id if partner else None
states_filter = self._get_domain_states_filter(
pholidays, start_dt, end_dt, partner_id=partner.id
pholidays, start_dt, end_dt, partner_id=partner_id
)
hhplo = self.env["hr.holidays.public.line"]
holidays_lines = hhplo.search(states_filter)
Expand All @@ -118,8 +119,9 @@ def is_public_holiday(self, selected_date, employee_id=None, partner_id=None):
:return: bool
"""
partner = self._get_partner_deprecated_employee(partner_id, employee_id)
partner_id = partner.id if partner else None
holidays_lines = self.get_holidays_list(
year=selected_date.year, partner_id=partner.id
year=selected_date.year, partner_id=partner_id
)
if holidays_lines:
hol_date = holidays_lines.filtered(lambda r: r.date == selected_date)
Expand All @@ -140,7 +142,7 @@ def _get_partner_deprecated_employee(self, partner_id, employee_id):
partner = employee.address_id
if partner_id:
if partner:
_logger.error(
_logger.warning(

Check warning on line 145 in hr_holidays_public/models/hr_holidays_public.py

View check run for this annotation

Codecov / codecov/patch

hr_holidays_public/models/hr_holidays_public.py#L145

Added line #L145 was not covered by tests
"Cannot use both employee_id and address_id in parameters. "
"Ignoring employee_id."
)
Expand Down

0 comments on commit df2cf31

Please sign in to comment.