Skip to content

[17.0][FIX] hr_shift: Prevent TypeError #24

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

Merged
OCA-git-bot merged 1 commit into from
Jan 21, 2026
Merged

[17.0][FIX] hr_shift: Prevent TypeError #24

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
8 changes: 7 additions & 1 deletion hr_shift/models/resource_calendar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,13 @@ def _attendance_intervals_batch(
]
start_time = string_to_datetime(shift.start_time).astimezone(tz)
end_time = string_to_datetime(shift.end_time).astimezone(tz)
intervals_to_add.append((start_time, end_time, shift))
# noqa: E501 Prevent TypeError: inconsistent models in: 'hr.shift.planning.line()' in 'resource.calendar.attendance()'
interval_to_add_item = (
resource_intervals[0][2] if resource_intervals else shift
)
intervals_to_add.append(
(start_time, end_time, interval_to_add_item)
)
res[resource.id]._items = [
x for x in resource_intervals if x not in intervals_to_remove
] + intervals_to_add
Expand Down