vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into develop

Browse source
This commit is contained in:
Saurabh 2018-05-02 16:18:48 +05:30
commit dee3a6ed1d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -17,7 +17,7 @@ from faker import Faker
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()

3
frappe/desk/query_report.py
View file

@ -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