diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py index 0a6386f103f..44b8063a00f 100644 --- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py @@ -124,11 +124,17 @@ def get_allocated_and_expired_leaves(records, from_date, to_date): def get_leave_ledger_entries(from_date, to_date, employee, leave_type): records= frappe.db.sql(""" SELECT +<<<<<<< HEAD employee, leave_type, from_date, to_date, leaves, transaction_name, transaction_type is_carry_forward, is_expired +======= + employee, leave_type, from_date, to_date, leaves, transaction_name, + transaction_type, is_carry_forward, is_expired +>>>>>>> 632f7848a3 (Update employee_leave_balance.py) 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))