Skip to content

Commit bd9eed1

Browse files
committed
Merge PR #848 into 15.0
Signed-off-by legalsylvain
2 parents c872f9a + 3755785 commit bd9eed1

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

bi_sql_editor/models/bi_sql_view_field.py

+10-2
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,20 @@ def _prepare_search_field(self):
250250

251251
def _prepare_search_filter_field(self):
252252
self.ensure_one()
253-
res = ""
253+
group_by_filter = ""
254+
field_filter = ""
254255
if self.field_description and self.is_group_by:
255-
res = """<filter name="group_by_%s" string="%s"
256+
group_by_filter = """<filter name="group_by_%s" string="%s"
256257
context="{'group_by':'%s'}"/>\n""" % (
257258
self.name,
258259
self.field_description,
259260
self.name,
260261
)
262+
if self.field_description and self.ttype in ["date", "datetime"]:
263+
field_filter = """<filter name="filter_%s" string="%s" date="%s"/>\n""" % (
264+
self.name,
265+
self.field_description,
266+
self.name,
267+
)
268+
res = "%s%s" % (field_filter, group_by_filter)
261269
return res

0 commit comments

Comments
 (0)