nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list

Browse Source
This commit is contained in:
Suraj Shetty
2019-08-29 20:09:55 +05:30
parent 3e11338ed5 233ee277ef
commit 9e4282e130
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/hr/doctype/leave_ledger_entry/leave_ledger_entry.py
View File

@@ -95,7 +95,6 @@ def process_expired_allocation():
'expire_carry_forwarded_leaves_after_days': (">", 0) 'expire_carry_forwarded_leaves_after_days': (">", 0)
}, fieldname=['name']) }, fieldname=['name'])
if leave_type_records:
leave_type = [record[0] for record in leave_type_records] leave_type = [record[0] for record in leave_type_records]
expired_allocation = frappe.db.sql_list("""SELECT name expired_allocation = frappe.db.sql_list("""SELECT name