Merge branch 'master' into develop

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '8.5.1'
+__version__ = '8.5.2'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/desk/reportview.py

@@ -336,6 +336,9 @@ def build_match_conditions(doctype, as_condition=True):
 
 def get_filters_cond(doctype, filters, conditions, ignore_permissions=None, with_match_conditions=False):
 	if filters:
+		if isinstance(filters, basestring):
+			filters = json.loads(filters)
+
 		flt = filters
 		if isinstance(filters, dict):
 			filters = filters.items()