Merge PR #443 into 14.0

Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2022-03-11 06:21:44 +00:00

View File

@@ -769,15 +769,25 @@ class AccountReconciliation(models.AbstractModel):
excluded_ids.extend(to_check_excluded)
domain_reconciliation = [
"&",
"&",
"&",
("statement_line_id", "=", False),
("account_id", "in", aml_accounts),
("payment_id", "<>", False),
("balance", "!=", 0.0),
]
if st_line.company_id.account_bank_reconciliation_start:
domain_reconciliation = expression.AND(
[
domain_reconciliation,
[
(
"date",
">=",
st_line.company_id.account_bank_reconciliation_start,
)
],
]
)
# default domain matching
domain_matching = [
"&",
@@ -830,20 +840,6 @@ class AccountReconciliation(models.AbstractModel):
# filter on account.move.line having the same company as the statement
# line
domain = expression.AND([domain, [("company_id", "=", st_line.company_id.id)]])
if st_line.company_id.account_bank_reconciliation_start:
domain = expression.AND(
[
domain,
[
(
"date",
">=",
st_line.company_id.account_bank_reconciliation_start,
)
],
]
)
return domain
@api.model