From 03587849b8d7bc03402882d5fbf1b0074daf9118 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 19 Sep 2019 13:09:06 +0530 Subject: [PATCH 1/3] fix: export report not working for add group --- frappe/desk/reportview.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index e3e408eeb1..a6ff8d7514 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -213,6 +213,10 @@ def get_labels(fields, doctype): for key in fields: key = key.split(" as ")[0] + if key.startswith('count('): continue + if key.startswith('sum('): continue + if key.startswith('avg('): continue + if "." in key: parenttype, fieldname = key.split(".")[0][4:-1], key.split(".")[1].strip("`") else: From d4ea2b4c1f66a2cd702347341f48b0c02c8225ae Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 19 Sep 2019 13:34:51 +0530 Subject: [PATCH 2/3] fix: merge key validations Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/desk/reportview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index a6ff8d7514..2b22845de9 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -213,7 +213,7 @@ def get_labels(fields, doctype): for key in fields: key = key.split(" as ")[0] - if key.startswith('count('): continue + if key.startswith(('count(', 'sum(', 'avg(')): continue if key.startswith('sum('): continue if key.startswith('avg('): continue From c120bd34661a7b36d5a1b9e4c622a2162d58601f Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 19 Sep 2019 13:39:56 +0530 Subject: [PATCH 3/3] fix: merge key validations --- frappe/desk/reportview.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 2b22845de9..dd984625fd 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -214,8 +214,6 @@ def get_labels(fields, doctype): key = key.split(" as ")[0] if key.startswith(('count(', 'sum(', 'avg(')): continue - if key.startswith('sum('): continue - if key.startswith('avg('): continue if "." in key: parenttype, fieldname = key.split(".")[0][4:-1], key.split(".")[1].strip("`")