From 99b4278f846149fbb4cff93c5c41e742fd64b63e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 9 Feb 2018 14:28:07 +0530 Subject: [PATCH] [report] Handle rows which can be list of dict (#4987) --- frappe/core/doctype/report/report.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index 25cd8e5e67..d11d7f0a51 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -159,10 +159,14 @@ class Report(Document): if as_dict: data = [] for row in out: - _row = frappe._dict() + if isinstance(row, (list, tuple)): + _row = frappe._dict() + for i, val in enumerate(row): + _row[columns[i].get('fieldname')] = val + elif isinstance(row, dict): + # no need to convert from dict to dict + _row = frappe._dict(row) data.append(_row) - for i, val in enumerate(row): - _row[columns[i].get('fieldname')] = val else: data = out return columns, data