nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Jannat Patel
2021-10-20 12:34:04 +05:30
committed by GitHub
parent ad736f1789
commit 9ae3f26dbf
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,13 +124,8 @@ 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
is_carry_forward, is_expired
=======
employee, leave_type, from_date, to_date, leaves, transaction_name, employee, leave_type, from_date, to_date, leaves, transaction_name,
transaction_type, is_carry_forward, is_expired 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