From 5b5afadcdb01ed0ac9fc2a243e619b7c57bcc4d2 Mon Sep 17 00:00:00 2001
From: Prateeksha Singh <pratu16x7@gmail.com>
Date: Fri, 29 Jun 2018 13:35:50 +0530
Subject: [PATCH] [report] add set_filters()

---
 .../js/frappe/views/reports/query_report.js      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index d7bba734f9..8dc7402fc1 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -133,6 +133,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 
 		return this._load_script;
 	}
+
 	setup_filters() {
 		this.clear_filters();
 		const { filters = [] } = this.report_settings;
@@ -140,7 +141,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		this.filters = filters.map(df => {
 			if (df.fieldtype === 'Break') return;
 
-			const f = this.page.add_field(df);
+			let f = this.page.add_field(df);
 
 			if (df.default) {
 				f.set_input(df.default);
@@ -156,7 +157,10 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				}
 			};
 
+			f = Object.assign(f, df);
+
 			return f;
+
 		}).filter(Boolean);
 
 		if (this.filters.length === 0) {
@@ -172,6 +176,12 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		this.set_filters_by_name();
 	}
 
+	set_filters(filters) {
+		this.filters.map(f => {
+			f.set_input(filters[f.fieldname]);
+		});
+	}
+
 	set_filters_by_name() {
 		frappe.query_report_filters_by_name = {};
 		for (var i in this.filters) {
@@ -254,6 +264,10 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			<a class="generated_report_list">See all</a>.
 		`));
 
+		let filters = JSON.parse(JSON.parse(doc.filters));
+
+		this.set_filters(filters);
+
 		$message.on('click', () => {
 			frappe.route_options = {
 				report_name: doc.report_name,