Skip to content

[18.0][FIX] hr_contract_employee_calendar_planning: Avoid making changes to contracts based on the appropriate calendar #1590

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

Open
victoralmau wants to merge 1 commit into
base: 18.0
Choose a base branch
from
Open

[18.0][FIX] hr_contract_employee_calendar_planning: Avoid making changes to contracts based on the appropriate calendar #1590

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hr_contract_employee_calendar_planning/hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ def post_init_hook(env):
for employee in employees.filtered("contract_ids"):
contract_calendar_lines = []
for contract in employee.contract_ids.sorted("date_start"):
if contract.resource_calendar_id == employee.resource_calendar_id:
continue
date_start = contract.date_start
date_end = contract.date_end
# filter calendar_ids to check for overlaps with contracts
Expand Down
4 changes: 4 additions & 0 deletions hr_contract_employee_calendar_planning/tests/test_hr_contract_employee_calendar_planning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,11 @@ def test_calendar_migration_from_contracts_01(self):
self.env.cr.execute(
f"UPDATE hr_contract SET resource_calendar_id = {self.calendar1.id} WHERE id = {self.contract_1.id}" # noqa: E501
)
self.contract_1.invalidate_recordset(["resource_calendar_id"])
self.env.cr.execute(
f"UPDATE hr_contract SET resource_calendar_id = {self.calendar2.id} WHERE id = {self.contract_2.id}" # noqa: E501
)
self.contract_2.invalidate_recordset(["resource_calendar_id"])
# calendar migration from contracts
old_calendars = self.employee.calendar_ids
post_init_hook(self.env)
Expand Down Expand Up @@ -103,9 +105,11 @@ def test_calendar_migration_from_contracts_02(self):
self.env.cr.execute(
f"UPDATE hr_contract SET resource_calendar_id = {self.calendar1.id} WHERE id = {self.contract_1.id}" # noqa: E501
)
self.contract_1.invalidate_recordset(["resource_calendar_id"])
self.env.cr.execute(
f"UPDATE hr_contract SET resource_calendar_id = {self.calendar2.id} WHERE id = {self.contract_2.id}" # noqa: E501
)
self.contract_2.invalidate_recordset(["resource_calendar_id"])
# calendar migration from contracts
old_calendars = self.employee.calendar_ids
post_init_hook(self.env)
Expand Down
Loading