From 7cba1f41a5242015a20ed92e07ea1b6a96ba1f60 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 2 May 2018 16:06:59 +0530 Subject: [PATCH 1/2] [urgent] Fix query_report has_match --- frappe/desk/query_report.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index f259f39de4..810886e4b1 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -293,7 +293,8 @@ def has_match(row, linked_doctypes, doctype_match_filters, ref_doctype, if_owner if dt=="User" and columns_dict[idx]==columns_dict.get("owner"): continue - if dt in match_filters and row.get(idx) not in match_filters.get(dt) and frappe.db.exists(dt, row.get(idx)): + cell_value = row[idx] + if dt in match_filters and cell_value not in match_filters.get(dt) and frappe.db.exists(dt, cell_value): match = False break From 36cfa144e6e2db3aee8e1fb737322f84a98d1e44 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 2 May 2018 16:48:47 +0600 Subject: [PATCH 2/2] bumped to version 10.1.27 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index f93aa361a4..3690ab2152 100644 --- a/frappe/__init__.py +++ b/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__ = '10.1.26' +__version__ = '10.1.27' __title__ = "Frappe Framework" local = Local()