Merge pull request #1077 from akhileshdarjee/master

[fix] [issue] webnotes/erpnext#1072 removed leave by from leave application
This commit is contained in:
Nabin Hait 2013-11-20 23:08:59 -08:00
commit 5ffb4f33af

View File

@ -281,7 +281,7 @@ def add_leaves(events, start, end, employee, company, match_conditions=None):
"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") + " " + cstr(d.employee_name) + \ "title": cstr(d.employee_name) + \
(d.half_day and _(" (Half Day)") or ""), (d.half_day and _(" (Half Day)") or ""),
"docstatus": d.docstatus "docstatus": d.docstatus
} }