Flectra/mis-builder
1
0
Fork 0
mirror of https://gitlab.com/flectra-community/mis-builder.git synced 2024-12-23 12:51:46 +00:00
Code Issues Projects Releases Wiki Activity

[FIX] Update from old repo

Browse Source
This commit is contained in:
Thomas Winteler 2021-06-11 07:50:40 +02:00
parent 261529aac1
commit 7d43bea155
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mis_builder/models/mis_report.py
View File

@ -611,24 +611,25 @@ class MisReport(models.Model):
domain = query.domain and safe_eval(query.domain, eval_context) or []
if get_additional_query_filter:
domain.extend(get_additional_query_filter(query))
if query.date_field.ttype == "date":
domain.extend(
[
(query.date_field.name, ">=", date_from),
(query.date_field.name, "<=", date_to),
]
)
else:
datetime_from = _utc_midnight(date_from, self._context.get("tz", "UTC"))
datetime_to = _utc_midnight(
date_to, self._context.get("tz", "UTC"), add_day=1
)
domain.extend(
[
(query.date_field.name, ">=", datetime_from),
(query.date_field.name, "<", datetime_to),
]
)
if query.date_field.ttype:
if query.date_field.ttype == "date":
domain.extend(
[
(query.date_field.name, ">=", date_from),
(query.date_field.name, "<=", date_to),
]
)
else:
datetime_from = _utc_midnight(date_from, self._context.get("tz", "UTC"))
datetime_to = _utc_midnight(
date_to, self._context.get("tz", "UTC"), add_day=1
)
domain.extend(
[
(query.date_field.name, ">=", datetime_from),
(query.date_field.name, "<", datetime_to),
]
)
field_names = [f.name for f in query.field_ids]
all_stored = all([model._fields[f].store for f in field_names])
if not query.aggregate: