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

fix: only create leave application ledger on intermediate allocation expiry

Browse Source
This commit is contained in:
Mangesh-Khairnar 2019-06-11 16:35:29 +05:30
parent b16d395a8f
commit 283d2c5ca2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,18 +370,19 @@ class LeaveApplication(Document):
''' splits leave application into two ledger entries to consider expiry of allocation ''' ''' splits leave application into two ledger entries to consider expiry of allocation '''
args = dict( args = dict(
from_date=self.from_date, from_date=self.from_date,
to_date=self.to_date, to_date=expiry_date,
leaves=(date_diff(expiry_date, self.from_date) + 1) * -1 leaves=(date_diff(expiry_date, self.from_date) + 1) * -1
) )
create_leave_ledger_entry(self, args, submit) create_leave_ledger_entry(self, args, submit)
start_date = add_days(expiry_date, 1) if expiry_date != self.to_date:
args.update(dict( start_date = add_days(expiry_date, 1)
from_date=start_date, args.update(dict(
to_date=self.to_date, from_date=start_date,
leaves=date_diff(self.to_date, expiry_date) * -1 to_date=self.to_date,
)) leaves=date_diff(self.to_date, expiry_date) * -1
create_leave_ledger_entry(self, args, submit) ))
create_leave_ledger_entry(self, args, submit)
def get_allocation_expiry(employee, leave_type, to_date, from_date): def get_allocation_expiry(employee, leave_type, to_date, from_date):
expiry = frappe.get_all("Leave Ledger Entry", expiry = frappe.get_all("Leave Ledger Entry",