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

Merge pull request #1719 from ShashaQin/patch-6

Browse source 
Problem on ‘Created On’/'Last Updated On' filter
This commit is contained in:
Rushabh Mehta 2016-05-02 13:33:09 +05:30
commit 7938ecb7d7
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frappe/model/db_query.py
View file

@ -300,9 +300,14 @@ class DatabaseQuery(object):
if isinstance(value, basestring):
value = '"{0}"'.format(frappe.db.escape(value, percent=False))
condition = 'ifnull({tname}.{fname}, {fallback}) {operator} {value}'.format(
tname=tname, fname=f.fieldname, fallback=fallback, operator=f.operator,
value=value)
if f.fieldname in ("creation", "modified"):
condition = '''ifnull(date_format({tname}.{fname},'%Y-%m-%d'), {fallback}) {operator} {value}'''.format(
tname=tname, fname=f.fieldname, fallback=fallback, operator=f.operator,
value=value)
else:
condition = 'ifnull({tname}.{fname}, {fallback}) {operator} {value}'.format(
tname=tname, fname=f.fieldname, fallback=fallback, operator=f.operator,
value=value)
return condition