From 78e9e3afc6722eb1aa02408d05c68072bbb5c07c Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 14 Feb 2022 17:27:18 +0100 Subject: [PATCH] [IMP] account_reconcile_widget: Allow to reconcile payment/debit orders from OCA/bank-payment Payments without payment_id related aren't showed in statement reconciliation. With this change, we show them as blue lines, the same as other coming from Odoo core payments. TT34508 --- .../models/reconciliation_widget.py | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/account_reconciliation_widget/models/reconciliation_widget.py b/account_reconciliation_widget/models/reconciliation_widget.py index d62ae19741..ec3586f3ca 100644 --- a/account_reconciliation_widget/models/reconciliation_widget.py +++ b/account_reconciliation_widget/models/reconciliation_widget.py @@ -769,15 +769,25 @@ def _domain_move_lines_for_reconciliation( 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 @@ def _domain_move_lines_for_reconciliation( # 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