From a576b9f0b6e782265d3a5c2357512d6d9664c698 Mon Sep 17 00:00:00 2001 From: Zarrar Date: Mon, 4 Dec 2017 12:27:32 +0530 Subject: [PATCH] Set proper fallbacks for start and end date (#4568) --- frappe/desk/calendar.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/desk/calendar.py b/frappe/desk/calendar.py index efe4f3ef20..ac7bd2ee1a 100644 --- a/frappe/desk/calendar.py +++ b/frappe/desk/calendar.py @@ -35,9 +35,12 @@ def get_events(doctype, start, end, field_map, filters=None, fields=None): if not fields: fields = [field_map.start, field_map.end, field_map.title, 'name'] + start_date = "ifnull(%s, '0000-00-00 00:00:00')" % field_map.start + end_date = "ifnull(%s, '2199-12-31 00:00:00')" % field_map.end + filters += [ - [doctype, field_map.start, '<=', end], - [doctype, field_map.end, '>=', start], + [doctype, start_date, '<=', end], + [doctype, end_date, '>=', start], ] return frappe.get_list(doctype, fields=fields, filters=filters)