浏览代码

Merge branch 'master' into develop

version-14
Nabin Hait 8 年前
父节点
当前提交
8d29df6ddd
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/desk/query_report.py

+ 1
- 1
frappe/__init__.py 查看文件

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template from .utils.jinja import get_jenv, get_template, render_template


__version__ = '8.0.61'
__version__ = '8.0.62'
__title__ = "Frappe Framework" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 1
- 1
frappe/desk/query_report.py 查看文件

@@ -287,7 +287,7 @@ def has_match(row, linked_doctypes, doctype_match_filters, ref_doctype, if_owner
if dt=="User" and columns_dict[idx]==columns_dict.get("owner"): if dt=="User" and columns_dict[idx]==columns_dict.get("owner"):
continue continue


if dt in match_filters and row[idx] not in match_filters[dt]:
if dt in match_filters and row[idx] not in match_filters[dt] and frappe.db.exists(dt, row[idx]):
match = False match = False
break break




正在加载...
取消
保存