nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update employee_leave_balance.py

Browse Source 
fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f7848a3)

# Conflicts:
#	erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
This commit is contained in:
Goh Yan Chang
2021-10-01 16:30:33 +08:00
committed by mergify-bot
parent 16ece12516
commit ad736f1789
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
View File

@@ -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): def get_leave_ledger_entries(from_date, to_date, employee, leave_type):
records= frappe.db.sql(""" records= frappe.db.sql("""
SELECT SELECT
<<<<<<< HEAD
employee, leave_type, from_date, to_date, leaves, transaction_name, transaction_type employee, leave_type, from_date, to_date, leaves, transaction_name, transaction_type
is_carry_forward, is_expired 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` FROM `tabLeave Ledger Entry`
WHERE employee=%(employee)s AND leave_type=%(leave_type)s WHERE employee=%(employee)s AND leave_type=%(leave_type)s
AND docstatus=1 AND docstatus=1
AND transaction_type = 'Leave Allocation'
AND (from_date between %(from_date)s AND %(to_date)s AND (from_date between %(from_date)s AND %(to_date)s
OR to_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)) OR (from_date < %(from_date)s AND to_date > %(to_date)s))