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

Compensatory Leave Request - fix

Browse Source
This commit is contained in:
Jamsheer 2018-05-14 18:08:31 +05:30
parent b848c51592
commit ead858b4de
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py
View File

@ -23,9 +23,8 @@ class CompensatoryLeaveRequest(Document):
date_difference = date_diff(self.work_end_date, self.work_from_date) + 1 date_difference = date_diff(self.work_end_date, self.work_from_date) + 1
leave_period = get_leave_period(self.work_from_date, self.work_end_date, company) leave_period = get_leave_period(self.work_from_date, self.work_end_date, company)
if leave_period: if leave_period:
leave_allocation_name = self.exists_allocation_for_period(leave_period) leave_allocation = self.exists_allocation_for_period(leave_period)
if leave_allocation_name: if leave_allocation:
leave_allocation = frappe.get_doc("Leave Allocation", leave_allocation_name)
new_leaves_allocated = leave_allocation.new_leaves_allocated new_leaves_allocated = leave_allocation.new_leaves_allocated
leave_allocation.new_leaves_allocated += date_difference leave_allocation.new_leaves_allocated += date_difference
leave_allocation.submit() leave_allocation.submit()
@ -51,7 +50,7 @@ class CompensatoryLeaveRequest(Document):
}, as_dict=1) }, as_dict=1)
if leave_allocation: if leave_allocation:
return leave_allocation[0].name return frappe.get_doc("Leave Allocation", leave_allocation[0].name)
else: else:
False False