Browse Source
Merge pull request #27728 from itechstro/develop
fix: Employee Leave Balance report should only consider ledgers of transaction type Leave Allocation
develop
Jannat Patel
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
1 deletions
-
erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
|
|
|
@ -182,10 +182,11 @@ def get_allocated_and_expired_leaves(from_date, to_date, employee, leave_type): |
|
|
|
records= frappe.db.sql(""" |
|
|
|
SELECT |
|
|
|
employee, leave_type, from_date, to_date, leaves, transaction_name, |
|
|
|
is_carry_forward, is_expired |
|
|
|
transaction_type, is_carry_forward, is_expired |
|
|
|
FROM `tabLeave Ledger Entry` |
|
|
|
WHERE employee=%(employee)s AND leave_type=%(leave_type)s |
|
|
|
AND docstatus=1 |
|
|
|
AND transaction_type = 'Leave Allocation' |
|
|
|
AND (from_date between %(from_date)s AND %(to_date)s |
|
|
|
OR to_date between %(from_date)s AND %(to_date)s |
|
|
|
OR (from_date < %(from_date)s AND to_date > %(to_date)s)) |
|
|
|
|
