From 119963714e3db6ecf7ae3f6abc04ee0572302ba6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 21 Dec 2015 21:07:54 +0530 Subject: [PATCH 1/2] [hotfix] reportview build_match_conditions --- frappe/desk/reportview.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 2e8783e252..6d2a64ff3e 100644 --- a/frappe/desk/reportview.py +++ b/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 From 64f2595f0a01adcbffe1c791ff99e1333f897188 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 21 Dec 2015 21:38:31 +0600 Subject: [PATCH 2/2] bumped to version 6.15.1 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index 981ae67f46..b15aed205a 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.15.0" +__version__ = "6.15.1" diff --git a/frappe/hooks.py b/frappe/hooks.py index 2854db1398..f5a8d177d4 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." 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" diff --git a/setup.py b/setup.py index dbc43db838..d5d02490d7 100644 --- a/setup.py +++ b/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(