From 066ecb44cc8aba6dc6228144445a4ac9df949dc7 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Thu, 21 May 2020 10:31:26 +0530
Subject: [PATCH] fix(Query Report): column reordering bug (#10270)

---
 frappe/desk/query_report.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py
index 74e841f107..0edfd57d4f 100644
--- a/frappe/desk/query_report.py
+++ b/frappe/desk/query_report.py
@@ -62,8 +62,16 @@ def generate_report_result(report, filters=None, user=None, custom_columns=None)
 		ljust_list(res, 6)
 
 	if report.custom_columns:
+		# Original query columns, needed to reorder data as per custom columns
+		query_columns = columns
+		# Reordered columns
 		columns = json.loads(report.custom_columns)
+
+		if report.report_type == 'Query Report':
+			result = reorder_data_for_custom_columns(columns, query_columns, result)
+
 		result = add_data_to_custom_columns(columns, result)
+
 	if custom_columns:
 		result = add_data_to_custom_columns(custom_columns, result)
 
@@ -208,6 +216,23 @@ def add_data_to_custom_columns(columns, result):
 
 	return data
 
+def reorder_data_for_custom_columns(custom_columns, columns, result):
+	reordered_result = []
+	columns = [col.split(":")[0] for col in columns]
+
+	for res in result:
+		r = []
+		for col in custom_columns:
+			try:
+				idx = columns.index(col.get("label"))
+				r.append(res[idx])
+			except ValueError:
+				pass
+
+		reordered_result.append(r)
+
+	return reordered_result
+
 def get_prepared_report_result(report, filters, dn="", user=None):
 	latest_report_data = {}
 	doc = None