Skip to content

[19.0][FIX] agreement_rebate: always return a Domain from _target_line_domain #125

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

Open
gdgellatly wants to merge 1 commit into
base: 19.0
Choose a base branch
from
Open

[19.0][FIX] agreement_rebate: always return a Domain from _target_line_domain #125

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
23 changes: 7 additions & 16 deletions agreement_rebate/wizards/settlement_create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,30 +116,21 @@ def _prepare_target_domain(self):
return domain

def _target_line_domain(self, agreement_domain, agreement, line=False):
domain = agreement_domain.copy()
domain = Domain(agreement_domain)
if agreement.start_date:
domain.append(
(
"invoice_date",
">=",
fields.Date.to_string(agreement.start_date),
)
domain &= Domain(
"invoice_date", ">=", fields.Date.to_string(agreement.start_date)
)
if agreement.end_date:
domain.append(
(
"invoice_date",
"<=",
fields.Date.to_string(agreement.end_date),
)
domain &= Domain(
"invoice_date", "<=", fields.Date.to_string(agreement.end_date)
)
if line:
domain += safe_eval(line.rebate_domain)
domain &= Domain(safe_eval(line.rebate_domain))
elif agreement.rebate_line_ids:
line_domains = Domain.OR(
domain &= Domain.OR(
[Domain(safe_eval(x.rebate_domain)) for x in agreement.rebate_line_ids]
)
domain = Domain(domain) & line_domains
return domain

def get_agregate_fields(self):
Expand Down
Loading