From 676011f868ef32e63ebb86b541d688535258736b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@akretion.com>
Date: Thu, 6 Aug 2020 01:34:05 -0300
Subject: [PATCH] reconciliation domain has no payment_id in OCB

---
 account_usability/account.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/account_usability/account.py b/account_usability/account.py
index d4ce910..69f2dbe 100644
--- a/account_usability/account.py
+++ b/account_usability/account.py
@@ -696,6 +696,15 @@ class AccountReconciliation(models.AbstractModel):
         # We want to replace a domain item by another one
         position = domain.index(('payment_id', '<>', False))
         domain[position] = ['journal_id', '=', st_line.journal_id.id]
+        if ('payment_id', '<>', False) in domain:
+            # True on official v12:
+            # https://github.com/odoo/odoo/blob/12.0/addons/account/models/reconciliation_widget.py#L490
+            position = domain.index(('payment_id', '<>', False))
+            domain[position] = ['journal_id', '=', st_line.journal_id.id]
+        else:
+            # OCB which has backport fixes from v13
+            # https://github.com/OCA/OCB/blob/12.0/addons/account/models/reconciliation_widget.py#L486
+            domain = expression.AND([domain, [('journal_id', '=', st_line.journal_id.id)]])
         return domain