Skip to content

trytond: Restore support of _datetime_exclude [CUSTOM] #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2024
Merged

trytond: Restore support of _datetime_exclude [CUSTOM] #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions trytond/trytond/model/modelsql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1846,6 +1846,12 @@ def convert(domain):
with without_check_access():
expression = convert(domain)

def apply_date_clause(column):
if transaction.context.get('_datetime_exclude', False):
return column < transaction.context['_datetime']
else:
return column <= transaction.context['_datetime']

if cls._history and transaction.context.get('_datetime'):
database = Transaction().database
if database.has_window_functions():
Expand All @@ -1862,7 +1868,7 @@ def convert(domain):
order_by=[
last_change.desc,
Column(history, '__id').desc])).as_('rank'),
where=((last_change <= transaction.context['_datetime'])
where=(apply_date_clause(last_change)
& history.id.in_(selected_h_ids)))
# Filter again as the latest records from most_recent might not
# match the expression
Expand All @@ -1881,7 +1887,7 @@ def convert(domain):
history_1.write_date, history_1.create_date)
latest_change = history_1.select(
history_1.id, Max(last_change).as_('date'),
where=(last_change <= transaction.context['_datetime']),
where=apply_date_clause(last_change),
group_by=[history_1.id])
most_recent = history_2.join(
latest_change,
Expand Down