diff --git a/account_reconcile_restrict_partner_mismatch/README.rst b/account_reconcile_restrict_partner_mismatch/README.rst
index 8d2f43c86..39a8e1267 100644
--- a/account_reconcile_restrict_partner_mismatch/README.rst
+++ b/account_reconcile_restrict_partner_mismatch/README.rst
@@ -98,6 +98,7 @@ Other credits
 -------------
 
 The migration of this module from 13.0 to 14.0 was financially supported
+The migration of this module from 16.0 to 18.0 was financially supported
 by Camptocamp
 
 Maintainers
diff --git a/account_reconcile_restrict_partner_mismatch/models/account_move_line.py b/account_reconcile_restrict_partner_mismatch/models/account_move_line.py
index ae875e325..756fe6df7 100644
--- a/account_reconcile_restrict_partner_mismatch/models/account_move_line.py
+++ b/account_reconcile_restrict_partner_mismatch/models/account_move_line.py
@@ -1,7 +1,6 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-
-from odoo import _, models
+from odoo import models
 from odoo.exceptions import UserError
 
 
@@ -21,18 +20,18 @@ def _check_partner_mismatch_on_reconcile(self):
             in ("asset_receivable", "liability_payable")
         )
 
-    def reconcile(self):
+    def _reconcile_plan(self, reconciliation_plan):
         # to be consistent with parent method
-        if self:
+        if reconciliation_plan:
             partners = set()
-            for line in self:
-                if line._check_partner_mismatch_on_reconcile:
-                    partners.add(line.partner_id.id)
+            for lines in reconciliation_plan:
+                checked_lines = lines.filtered(lambda l: l._check_partner_mismatch_on_reconcile)
+                partners.update(line.partner_id.id for line in checked_lines)
             if len(partners) > 1:
                 raise UserError(
-                    _(
+                    self.env._(
                         "The partner has to be the same on all"
                         " lines for receivable and payable accounts!"
                     )
                 )
-        return super().reconcile()
+        return super()._reconcile_plan(reconciliation_plan)
diff --git a/account_reconcile_restrict_partner_mismatch/readme/CREDITS.md b/account_reconcile_restrict_partner_mismatch/readme/CREDITS.md
index 4351fe296..5dfda7ecb 100644
--- a/account_reconcile_restrict_partner_mismatch/readme/CREDITS.md
+++ b/account_reconcile_restrict_partner_mismatch/readme/CREDITS.md
@@ -1,2 +1,3 @@
 The migration of this module from 13.0 to 14.0 was financially supported
+The migration of this module from 16.0 to 18.0 was financially supported
 by Camptocamp
diff --git a/account_reconcile_restrict_partner_mismatch/report/account_move_lines_report.xml b/account_reconcile_restrict_partner_mismatch/report/account_move_lines_report.xml
index c5930500e..fa294e360 100644
--- a/account_reconcile_restrict_partner_mismatch/report/account_move_lines_report.xml
+++ b/account_reconcile_restrict_partner_mismatch/report/account_move_lines_report.xml
@@ -4,7 +4,7 @@
         <field name="name">Reconciled items with partner mismatch</field>
         <field name="model">account.reconcile.partner.mismatch.report</field>
         <field name="arch" type="xml">
-            <tree create="false" delete="false" edit="false">
+            <list create="false" delete="false" edit="false">
                 <!-- links are not clickable in tree view
                 only after open form view -->
                 <field name="partial_reconcile_id" />
@@ -17,7 +17,7 @@
                 <field name="credit_partner_id" />
                 <field name="account_type" />
                 <field name="account_id" />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="account_reconcile_partner_mismatch_report_view_form" model="ir.ui.view">
@@ -57,7 +57,7 @@
     >
         <field name="name">Reconciled items with partner mismatch</field>
         <field name="res_model">account.reconcile.partner.mismatch.report</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
     </record>
     <menuitem
         id="menu_account_reconcile_partner_mismatch_report"
diff --git a/account_reconcile_restrict_partner_mismatch/static/description/index.html b/account_reconcile_restrict_partner_mismatch/static/description/index.html
index 2c52609d9..9958cadbd 100644
--- a/account_reconcile_restrict_partner_mismatch/static/description/index.html
+++ b/account_reconcile_restrict_partner_mismatch/static/description/index.html
@@ -448,6 +448,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <div class="section" id="other-credits">
 <h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
 <p>The migration of this module from 13.0 to 14.0 was financially supported
+The migration of this module from 16.0 to 18.0 was financially supported
 by Camptocamp</p>
 </div>
 <div class="section" id="maintainers">
diff --git a/account_reconcile_restrict_partner_mismatch/tests/test_reconciliation.py b/account_reconcile_restrict_partner_mismatch/tests/test_reconciliation.py
index 1be0bd1d8..7d8b78132 100644
--- a/account_reconcile_restrict_partner_mismatch/tests/test_reconciliation.py
+++ b/account_reconcile_restrict_partner_mismatch/tests/test_reconciliation.py
@@ -2,10 +2,12 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from odoo.exceptions import UserError
+from odoo.tests import tagged
 
 from odoo.addons.base.tests.common import BaseCommon
 
 
+@tagged("-at_install", "post_install")
 class TestReconciliation(BaseCommon):
     @classmethod
     def setUpClass(cls):
@@ -141,3 +143,28 @@ def test_reconcile_accounts_excluded(self):
         self.aml.move_id.action_post()
         self.aml.reconcile()
         self.assertTrue(all(self.aml.mapped("reconciled")))
+
+    def test_reconcile_same_partner(self):
+        """Test reconciliation of two move lines with same partner works."""
+        self.aml.move_id.company_id.restrict_partner_mismatch_on_reconcile = True
+        # Set same partner for both lines
+        self.aml.write({'partner_id': self.partner.id})
+        self.aml.move_id.action_post()
+        self.aml.reconcile()
+        self.assertTrue(all(self.aml.mapped("reconciled")))
+
+    def test_reconcile_different_journals(self):
+        """Test reconciliation works across different journals."""
+        # Create second journal
+        cash_journal = self.env["account.journal"].create(
+            {"name": "Cash", "type": "cash", "code": "CSH67"}
+        )
+
+        # Update journals of existing moves
+        self.aml[0].move_id.journal_id = self.bank_journal
+        self.aml[1].move_id.journal_id = cash_journal
+
+        # Test reconciliation
+        self.aml.move_id.action_post()
+        self.aml.reconcile()
+        self.assertTrue(all(self.aml.mapped("reconciled")))
diff --git a/account_reconcile_restrict_partner_mismatch/views/account_journal.xml b/account_reconcile_restrict_partner_mismatch/views/account_journal.xml
index d1b3a4f14..07580a658 100644
--- a/account_reconcile_restrict_partner_mismatch/views/account_journal.xml
+++ b/account_reconcile_restrict_partner_mismatch/views/account_journal.xml
@@ -7,7 +7,7 @@
         <field name="inherit_id" ref="account.view_account_journal_form" />
         <field name="arch" type="xml">
             <xpath
-                expr="//field[@name='sale_activity_type_id']/parent::group"
+                expr="//field[@name='invoice_reference_type']/parent::group"
                 position="after"
             >
                 <group
diff --git a/account_reconcile_restrict_partner_mismatch/views/res_config_settings.xml b/account_reconcile_restrict_partner_mismatch/views/res_config_settings.xml
index 9dbe7327c..c6bb8e69c 100644
--- a/account_reconcile_restrict_partner_mismatch/views/res_config_settings.xml
+++ b/account_reconcile_restrict_partner_mismatch/views/res_config_settings.xml
@@ -7,24 +7,19 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="account.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <div id="quick_edit_mode" position="after">
-                <h2>Partners Mismatch Restriction on Reconcile</h2>
-                <div class="row mt16 o_settings_container" id="quick_edit_mode">
-                    <div class="col-12 col-lg-12 o_setting_box">
-                        <div class="o_setting_left_pane mt16">
-                            <div>
-                                <field name="restrict_partner_mismatch_on_reconcile" />
-                            </div>
-                        </div>
-                        <div class="o_setting_right_pane mt16">
-                            <label for="restrict_partner_mismatch_on_reconcile" />
-                            <div class="text-muted">
-                                Check this if you want to avoid partner mismatch (several different partners) on reconciliation.
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <block id="quick_edit_mode" position="after">
+                <block
+                    title="Partners Mismatch Restriction on Reconcile"
+                    name="account_reconcile_restrict_partner_mismatch"
+                >
+                    <setting
+                        id="restrict_partner_mismatch_on_reconcile"
+                        help="Check this if you want to avoid partner mismatch (several different partners) on reconciliation."
+                    >
+                        <field name="restrict_partner_mismatch_on_reconcile" />
+                    </setting>
+                </block>
+            </block>
         </field>
     </record>
 </odoo>