audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #443 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2022-03-11 06:21:44 +00:00
parent 6f643c7b58 78e9e3afc6
commit fd69d6ac1e
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
account_reconciliation_widget/models/reconciliation_widget.py
View File

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