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

Merge pull request #3503 from neilLasrado/leave-application

Browse Source 
Fixed bugs in Calender View for Leave Application
This commit is contained in:
Nabin Hait 2015-06-22 19:32:16 +05:30
commit 38bebe1b83
1 changed files with 2 additions and 0 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

@ -339,6 +339,7 @@ def add_block_dates(events, start, end, employee, company):
events.append({ events.append({
"doctype": "Leave Block List Date", "doctype": "Leave Block List Date",
"from_date": block_date.block_date, "from_date": block_date.block_date,
"to_date": block_date.block_date,
"title": _("Leave Blocked") + ": " + block_date.reason, "title": _("Leave Blocked") + ": " + block_date.reason,
"name": "_" + str(cnt), "name": "_" + str(cnt),
}) })
@ -355,6 +356,7 @@ def add_holidays(events, start, end, employee, company):
events.append({ events.append({
"doctype": "Holiday", "doctype": "Holiday",
"from_date": holiday.holiday_date, "from_date": holiday.holiday_date,
"to_date": holiday.holiday_date,
"title": _("Holiday") + ": " + cstr(holiday.description), "title": _("Holiday") + ": " + cstr(holiday.description),
"name": holiday.name "name": holiday.name
}) })