vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

#12224 improve

Browse source
This commit is contained in:
ollyboy 2021-01-26 18:32:34 +00:00
parent b00b325688
commit b2fbcacfd4
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/desk/calendar.py
View file

@ -29,6 +29,7 @@ def get_event_conditions(doctype, filters=None):
def get_events(doctype, start, end, field_map, filters=None, fields=None):
field_map = frappe._dict(json.loads(field_map))
fields = json.loads ( fields )
doc_meta = frappe.get_meta(doctype)
for d in doc_meta.fields:
@ -44,8 +45,6 @@ def get_events(doctype, start, end, field_map, filters=None, fields=None):
fields = [field_map.start, field_map.end, field_map.title, 'name']
if field_map.color:
if isinstance(fields, str):
fields = json.loads ( fields )
fields.append(field_map.color)
start_date = "ifnull(%s, '0001-01-01 00:00:00')" % field_map.start