nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure employee name is a string

Browse Source
This commit is contained in:
Anand Doshi
2013-02-18 19:15:56 +05:30
parent 62ef71be57
commit d19e2f56cc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,7 @@ class DocType(DocListController):
def _get_message(url=False): def _get_message(url=False):
name = self.doc.name name = self.doc.name
employee_name = employee.employee_name employee_name = cstr(employee.employee_name)
if url: if url:
name = get_url_to_form(self.doc.doctype, self.doc.name) name = get_url_to_form(self.doc.doctype, self.doc.name)
employee_name = get_url_to_form("Employee", self.doc.employee, label=employee_name) employee_name = get_url_to_form("Employee", self.doc.employee, label=employee_name)
@@ -250,7 +250,7 @@ def add_department_leaves(events, start, end, employee, company):
"from_date": d.from_date, "from_date": d.from_date,
"to_date": d.to_date, "to_date": d.to_date,
"status": d.status, "status": d.status,
"title": _("Leave by") + " " + d.employee_name + \ "title": _("Leave by") + " " + cstr(d.employee_name) + \
(d.half_day and _(" (Half Day)") or "") (d.half_day and _(" (Half Day)") or "")
}) })