Skip to content

[15.0] fix showing already used leaves from overlaping #132

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
albig merged 2 commits into from
Dec 30, 2025
Merged

[15.0] fix showing already used leaves from overlaping #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e51919c
Allow showing "0" holidays in dashboard
albig Dec 30, 2025
2cc12ca
hr_holidays_overlap: proper check for non-existing setting
albig Dec 30, 2025
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: 1 addition & 1 deletion hr_holidays_overlap/models/hr_leave_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def _get_employees_days_per_allocation(self, employee_ids, date=None):
allocation_dict[False][
"virtual_remaining_leaves"
] += number_of_days
if not allocation_dict["error"]["virtual_remaining_leaves"]:
if allocation_dict["error"]["virtual_remaining_leaves"] is None:
del allocation_dict["error"]
del allocation_dict[False]
return result
Expand Down
1 change: 0 additions & 1 deletion verdigado_attendance/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"hr_attendance_break_autoclose",
"hr_attendance_missing_days",
"hr_attendance_overtime_manual",
"hr_attendance_overtime_negative_hours",
"hr_employee_calendar_planning",
"hr_holidays_attendance",
"l10n_de_holidays",
Expand Down
Loading
Loading