Merge branch 'develop'

Author: anandpdoshi

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.15.0"
+__version__ = "6.15.1"

frappe/desk/reportview.py

@@ -180,4 +180,8 @@ def get_match_cond(doctype):
 	return ((' and ' + cond) if cond else "").replace("%", "%%")
 
 def build_match_conditions(doctype, as_condition=True):
-	return (DatabaseQuery(doctype).build_match_conditions(as_condition=as_condition)).replace("%", "%%")
+	match_conditions =  DatabaseQuery(doctype).build_match_conditions(as_condition=as_condition)
+	if as_condition:
+		return match_conditions.replace("%", "%%")
+	else:
+		return match_conditions

frappe/hooks.py

@@ -5,7 +5,7 @@
 app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.15.0"
+app_version = "6.15.1"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.15.0"
+version = "6.15.1"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(