nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-28 02:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: calculate remaining leave balance (#20342)

Browse Source 
* fix: calculate remaining leave balance

* fix: nonetype issue in the total leaves calculation
This commit is contained in:
Mangesh-Khairnar
2020-01-20 19:42:49 +05:30
committed by Anurag Mishra
parent 19c5e031a9
commit 541881162a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -520,8 +520,7 @@ def get_pending_leaves_for_period(employee, leave_type, from_date, to_date):
def get_remaining_leaves(allocation, leaves_taken, date, expiry):
''' Returns minimum leaves remaining after comparing with remaining days for allocation expiry '''
def _get_remaining_leaves(allocated_leaves, end_date):
remaining_leaves = flt(allocated_leaves) + flt(leaves_taken)
def _get_remaining_leaves(remaining_leaves, end_date):
if remaining_leaves > 0:
remaining_days = date_diff(end_date, date) + 1
@@ -529,10 +528,11 @@ def get_remaining_leaves(allocation, leaves_taken, date, expiry):
return remaining_leaves
total_leaves = allocation.total_leaves_allocated
total_leaves = flt(allocation.total_leaves_allocated) + flt(leaves_taken)
if expiry and allocation.unused_leaves:
remaining_leaves = _get_remaining_leaves(allocation.unused_leaves, expiry)
remaining_leaves = flt(allocation.unused_leaves) + flt(leaves_taken)
remaining_leaves = _get_remaining_leaves(remaining_leaves, expiry)
total_leaves = flt(allocation.new_leaves_allocated) + flt(remaining_leaves)