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

Merge pull request #20341 from Mangesh-Khairnar/fix-remaining-leave-balance-calculation

Browse Source 
fix: calculate remaining leave balance
This commit is contained in:
Mangesh-Khairnar 2020-01-20 21:50:47 +05:30 committed by GitHub
commit c438a20b76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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