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

Merge branch 'hotfix'

Browse source
This commit is contained in:
mbauskar 2017-07-18 16:37:50 +05:30
commit f02145f63f
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -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__ = '8.5.1'
__version__ = '8.5.2'
__title__ = "Frappe Framework"
local = Local()

3
frappe/desk/reportview.py
View file

@ -336,6 +336,9 @@ def build_match_conditions(doctype, as_condition=True):
def get_filters_cond(doctype, filters, conditions, ignore_permissions=None, with_match_conditions=False):
if filters:
if isinstance(filters, basestring):
filters = json.loads(filters)
flt = filters
if isinstance(filters, dict):
filters = filters.items()