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

Fixes in leave application

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-07-29 18:39:27 +05:30
parent 3b67c89e0b
commit e73941b9cc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,7 @@ def get_total_leave_days(leave_app):
ret = {'total_leave_days' : 0.5} ret = {'total_leave_days' : 0.5}
if not leave_app.half_day: if not leave_app.half_day:
tot_days = date_diff(leave_app.to_date, leave_app.from_date) + 1 tot_days = date_diff(leave_app.to_date, leave_app.from_date) + 1
if frappe.db.get_value("Leave Type", self.leave_type, "include_holiday"): if frappe.db.get_value("Leave Type", leave_app.leave_type, "include_holiday"):
holidays = leave_app.get_holidays() holidays = leave_app.get_holidays()
ret = { ret = {
'total_leave_days' : flt(tot_days)-flt(holidays) 'total_leave_days' : flt(tot_days)-flt(holidays)