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

fix: holidays was showing on same date in calendar view (#17754)

Browse Source
This commit is contained in:
Anurag Mishra 2019-05-27 13:20:42 +05:30 committed by Nabin Hait
parent a29ed40ad3
commit 9d9440277c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/hr/doctype/holiday_list/holiday_list.py
View File

@ -79,6 +79,7 @@ def get_events(start, end, filters=None):
filters.append(['Holiday', 'holiday_date', '>', getdate(start)]) filters.append(['Holiday', 'holiday_date', '>', getdate(start)])
if end: if end:
filters.append(['Holiday', 'holiday_date', '<', getdate(end)]) filters.append(['Holiday', 'holiday_date', '<', getdate(end)])
return frappe.get_list('Holiday List', return frappe.get_list('Holiday List',
fields=['name', '`tabHoliday`.holiday_date', '`tabHoliday`.description', '`tabHoliday List`.color'], fields=['name', '`tabHoliday`.holiday_date', '`tabHoliday`.description', '`tabHoliday List`.color'],
filters = filters, filters = filters,

4
erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
View File

@ -3,8 +3,8 @@
frappe.views.calendar["Holiday List"] = { frappe.views.calendar["Holiday List"] = {
field_map: { field_map: {
"start": "from_date", "start": "holiday_date",
"end": "to_date", "end": "holiday_date",
"id": "name", "id": "name",
"title": "description", "title": "description",
"allDay": "allDay" "allDay": "allDay"