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

Merge pull request #381 from anandpdoshi/hotfix-reportview-filters

Browse source 
Reportview Filters null value fix
This commit is contained in:
Pratik Vyas 2013-12-30 05:26:47 -08:00
commit c99feef3cf
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
webnotes/widgets/reportview.py
View file

@ -184,15 +184,15 @@ def build_filter_conditions(filters, conditions):
"fieldname": f[1]})
if df and df[0].fieldtype in ["Float", "Int", "Currency", "Percent"]:
val, default_null_val = flt(f[3]), 0
val, default_null_val = flt(f[3]), "0"
else:
val, default_null_val = ("'" + f[3].replace("'", "\\'") + "'"), ""
val, default_null_val = ("'" + f[3].replace("'", "\\'") + "'"), '""'
else:
val, default_null_val = f[3], 0
val, default_null_val = f[3], '0'
conditions.append('ifnull(' + tname + '.' + f[1] + ", '"+ default_null_val +"') " \
+ f[2] + " " + cstr(val))
conditions.append('ifnull({tname}.{fname}, {default_val}) {operator} {value}'.format(
tname=tname, fname=f[1], default_val=default_null_val, operator=f[2],
value=cstr(val)))
def build_match_conditions(doctype, fields=None, as_condition=True):
"""add match conditions if applicable"""