nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed cstr in return for get_server_fields()

Browse Source
This commit is contained in:
Nabin Hait
2011-08-17 10:50:57 +05:30
parent 192db6a7cd
commit d075a6c53d
11 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hr/doctype/leave_application/leave_application.py
View File

@@ -33,7 +33,7 @@ class DocType:
leave_app = sql("select total_leave_days from `tabLeave Application` where employee = '%s' and leave_type = '%s' and fiscal_year = '%s' and docstatus = 1" % (self.doc.employee, self.doc.leave_type, self.doc.fiscal_year))
leave_app = leave_app and flt(leave_app[0][0]) or 0
ret = {'leave_balance':leave_all - leave_app}
return str(ret)
return ret
# ************************************************ utilities *************************************************
@@ -55,7 +55,7 @@ class DocType:
tot_days = date_diff(self.doc.to_date, self.doc.from_date) + 1
holidays = self.get_holidays()
ret = {'total_leave_days':flt(tot_days)-flt(holidays)}
return str(ret)
return ret
# ************************************************ validate *************************************************