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

fix: disable leave application against expired allocations #2463

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

fix: disable leave application against expired allocations #2463

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d019edc
fix: disable leave application against expired allocations
AyshaHakeem Nov 28, 2024
fad581b
Merge branch 'develop' into fix-leave-allocation
AyshaHakeem Dec 6, 2024
7b5fe99
fix: leave balance calculation
AyshaHakeem Jan 14, 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
1 change: 0 additions & 1 deletion hrms/hr/doctype/leave_application/leave_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,6 @@ def get_leave_allocation_records(employee, date, leave_type=None):
& (Ledger.docstatus == 1)
& (Ledger.transaction_type == "Leave Allocation")
& (Ledger.employee == employee)
& (Ledger.is_expired == 0)
& (Ledger.is_lwp == 0)
& (
# newly allocated leave's end date is same as the leave allocation's to date
Expand Down
Loading