Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[minor] Fix typo

Browse Source
This commit is contained in:
Shreya 2018-05-16 11:06:02 +05:30
parent e8358f33a3
commit 2a1bcf285b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/leave_application/leave_application.py
View File

@ -378,7 +378,7 @@ def get_leave_details(employee, date):
@frappe.whitelist() @frappe.whitelist()
def get_leave_balance_on(employee, leave_type, date, allocation_records=None, def get_leave_balance_on(employee, leave_type, date, allocation_records=None,
consider_all_leaves_in_the_allocation_period=False, consider_encshed_leaves=True): consider_all_leaves_in_the_allocation_period=False, consider_encashed_leaves=True):
if allocation_records == None: if allocation_records == None:
allocation_records = get_leave_allocation_records(date, employee).get(employee, frappe._dict()) allocation_records = get_leave_allocation_records(date, employee).get(employee, frappe._dict())
@ -389,7 +389,7 @@ def get_leave_balance_on(employee, leave_type, date, allocation_records=None,
leaves_taken = get_leaves_for_period(employee, leave_type, allocation.from_date, date, status="Approved") leaves_taken = get_leaves_for_period(employee, leave_type, allocation.from_date, date, status="Approved")
leaves_encashed = 0 leaves_encashed = 0
if frappe.db.get_value("Leave Type", leave_type, 'allow_encashment') and consider_encshed_leaves: if frappe.db.get_value("Leave Type", leave_type, 'allow_encashment') and consider_encashed_leaves:
leaves_encashed = flt(allocation.total_leaves_encashed) leaves_encashed = flt(allocation.total_leaves_encashed)
return flt(allocation.total_leaves_allocated) - (flt(leaves_taken) + flt(leaves_encashed)) return flt(allocation.total_leaves_allocated) - (flt(leaves_taken) + flt(leaves_encashed))