diff --git a/account_payment_mode_auto_reconcile/README.rst b/account_payment_mode_auto_reconcile/README.rst
index 2722274464..52d66827b5 100644
--- a/account_payment_mode_auto_reconcile/README.rst
+++ b/account_payment_mode_auto_reconcile/README.rst
@@ -14,14 +14,14 @@ Account Payment Mode Auto Reconcile
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github
-    :target: https://github.com/OCA/account-reconcile/tree/10.0/account_payment_mode_auto_reconcile
+    :target: https://github.com/OCA/account-reconcile/tree/16.0/account_payment_mode_auto_reconcile
     :alt: OCA/account-reconcile
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/account-reconcile-10-0/account-reconcile-10-0-account_payment_mode_auto_reconcile
+    :target: https://translation.odoo-community.org/projects/account-reconcile-16-0/account-reconcile-16-0-account_payment_mode_auto_reconcile
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/98/10.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/account-reconcile&target_branch=16.0
+    :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
@@ -48,7 +48,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-reconcile/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_payment_mode_auto_reconcile%0Aversion:%2010.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_payment_mode_auto_reconcile%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -78,6 +78,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/account-reconcile <https://github.com/OCA/account-reconcile/tree/10.0/account_payment_mode_auto_reconcile>`_ project on GitHub.
+This module is part of the `OCA/account-reconcile <https://github.com/OCA/account-reconcile/tree/16.0/account_payment_mode_auto_reconcile>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_payment_mode_auto_reconcile/__manifest__.py b/account_payment_mode_auto_reconcile/__manifest__.py
index 8df1becf84..49065fa93b 100644
--- a/account_payment_mode_auto_reconcile/__manifest__.py
+++ b/account_payment_mode_auto_reconcile/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Account Payment Mode Auto Reconcile",
     "summary": "Reconcile outstanding credits according to payment mode",
-    "version": "10.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Banking addons",
     "website": "https://github.com/OCA/account-reconcile",
     "author": "Camptocamp, Odoo Community Association (OCA)",
diff --git a/account_payment_mode_auto_reconcile/models/__init__.py b/account_payment_mode_auto_reconcile/models/__init__.py
index bc3defd590..ef4706f2f4 100644
--- a/account_payment_mode_auto_reconcile/models/__init__.py
+++ b/account_payment_mode_auto_reconcile/models/__init__.py
@@ -1,3 +1,3 @@
-from . import account_invoice
+from . import account_move
 from . import account_partial_reconcile
 from . import account_payment_mode
diff --git a/account_payment_mode_auto_reconcile/models/account_invoice.py b/account_payment_mode_auto_reconcile/models/account_move.py
similarity index 65%
rename from account_payment_mode_auto_reconcile/models/account_invoice.py
rename to account_payment_mode_auto_reconcile/models/account_move.py
index f66efcd4c8..fa993dd856 100644
--- a/account_payment_mode_auto_reconcile/models/account_invoice.py
+++ b/account_payment_mode_auto_reconcile/models/account_move.py
@@ -1,20 +1,15 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
-import json
 from operator import itemgetter
 
 from odoo import _, api, fields, models
 
 
-class AccountInvoice(models.Model):
+class AccountMove(models.Model):
 
-    _inherit = "account.invoice"
+    _inherit = "account.move"
 
     # Allow changing payment mode in open state
-    # TODO: Check if must be done in account_payment_partner instead
-    payment_mode_id = fields.Many2one(
-        states={"draft": [("readonly", False)], "open": [("readonly", False)]}
-    )
     payment_mode_warning = fields.Char(
         compute="_compute_payment_mode_warning",
     )
@@ -22,11 +17,10 @@ class AccountInvoice(models.Model):
         compute="_compute_payment_mode_warning",
     )
 
-    @api.multi
-    def invoice_validate(self):
-        res = super(AccountInvoice, self).invoice_validate()
+    def action_post(self):
+        res = super(AccountMove, self).action_post()
         for invoice in self:
-            if invoice.type != "out_invoice":
+            if invoice.move_type != "out_invoice":
                 continue
             if not invoice.payment_mode_id.auto_reconcile_outstanding_credits:
                 continue
@@ -36,16 +30,16 @@ def invoice_validate(self):
             ).auto_reconcile_credits(partial_allowed=partial)
         return res
 
-    @api.multi
     def write(self, vals):
-        res = super(AccountInvoice, self).write(vals)
-        if "payment_mode_id" in vals:
+        res = super(AccountMove, self).write(vals)
+        if "payment_mode_id" in vals or "state" in vals:
             for invoice in self:
                 # Do not auto reconcile anything else than open customer inv
-                if invoice.state != "open" or invoice.type != "out_invoice":
+                if invoice.state != "posted" or invoice.move_type != "out_invoice":
                     continue
-                payment_mode = invoice.payment_mode_id
+                invoice_lines = invoice.line_ids.filtered(lambda l: l.display_type == 'payment_term')
                 # Auto reconcile if payment mode sets it
+                payment_mode = invoice.payment_mode_id
                 if payment_mode and payment_mode.auto_reconcile_outstanding_credits:
                     partial = payment_mode.auto_reconcile_allow_partial
                     invoice.with_context(
@@ -53,33 +47,41 @@ def write(self, vals):
                     ).auto_reconcile_credits(partial_allowed=partial)
                 # If the payment mode is not using auto reconcile we remove
                 #  the existing reconciliations
-                elif invoice.payment_move_line_ids:
+                elif any(
+                    [
+                        invoice_lines.mapped("matched_credit_ids"),
+                        invoice_lines.mapped("matched_debit_ids"),
+                    ]
+                ):
                     invoice.auto_unreconcile_credits()
         return res
 
-    @api.multi
     def auto_reconcile_credits(self, partial_allowed=True):
         for invoice in self:
-            if not invoice.has_outstanding:
+            invoice._compute_payments_widget_to_reconcile_info()
+
+            if not invoice.invoice_has_outstanding:
                 continue
-            credits_info = json.loads(invoice.outstanding_credits_debits_widget)
+            credits_info = invoice.invoice_outstanding_credits_debits_widget
             # Get outstanding credits in chronological order
             # (using reverse because aml is sorted by date desc as default)
-            credits_dict = credits_info.get("content")
+            credits_dict = credits_info.get("content", False)
             if invoice.payment_mode_id.auto_reconcile_same_journal:
                 credits_dict = invoice._filter_payment_same_journal(credits_dict)
             sorted_credits = self._sort_credits_dict(credits_dict)
             for credit in sorted_credits:
-                if not partial_allowed and credit.get("amount") > invoice.residual:
+                if (
+                    not partial_allowed
+                    and credit.get("amount") > invoice.amount_residual
+                ):
                     continue
-                invoice.assign_outstanding_credit(credit.get("id"))
+                invoice.js_assign_outstanding_line(credit.get("id"))
 
     @api.model
     def _sort_credits_dict(self, credits_dict):
         """Sort credits dict according to their id (oldest recs first)"""
         return sorted(credits_dict, key=itemgetter("id"))
 
-    @api.multi
     def _filter_payment_same_journal(self, credits_dict):
         """Keep only credits on the same journal than the invoice."""
         self.ensure_one()
@@ -89,34 +91,47 @@ def _filter_payment_same_journal(self, credits_dict):
         )
         return [credit for credit in credits_dict if credit["id"] in lines.ids]
 
-    @api.multi
     def auto_unreconcile_credits(self):
         for invoice in self:
-            payments_info = json.loads(invoice.payments_widget or "{}")
+            payments_info = invoice.invoice_payments_widget
             for payment in payments_info.get("content", []):
-                aml = self.env["account.move.line"].browse(payment.get("payment_id"))
+                payment_aml = (
+                    self.env["account.payment"]
+                    .browse(payment.get("account_payment_id"))
+                    .line_ids
+                )
+
+                aml = payment_aml.filtered(lambda l: l.matched_debit_ids)
                 for apr in aml.matched_debit_ids:
                     if apr.amount != payment.get("amount"):
                         continue
                     if (
                         apr.payment_mode_auto_reconcile
-                        and apr.debit_move_id.invoice_id == invoice
+                        and apr.debit_move_id.move_id == invoice
                     ):
-                        aml.with_context(invoice_id=invoice.id).remove_move_reconcile()
+                        aml.remove_move_reconcile()
 
     @api.depends(
-        "type", "payment_mode_id", "payment_move_line_ids", "state", "has_outstanding"
+        "move_type", "payment_mode_id", "payment_id", "state", "invoice_has_outstanding"
     )
     def _compute_payment_mode_warning(self):
         # TODO Improve me but watch out
         for invoice in self:
-            if invoice.type != "out_invoice" or invoice.state == "paid":
+            existed_reconciliations = any(
+                [
+                    invoice.line_ids.mapped("matched_credit_ids"),
+                    invoice.line_ids.mapped("matched_debit_ids"),
+                ]
+            )
+            if invoice.move_type != "out_invoice" or (
+                invoice.state == "posted" and invoice.payment_state != "paid"
+            ):
                 invoice.payment_mode_warning = ""
                 invoice.display_payment_mode_warning = False
                 continue
             invoice.display_payment_mode_warning = True
             if (
-                invoice.state != "open"
+                invoice.state != "posted"
                 and invoice.payment_mode_id
                 and invoice.payment_mode_id.auto_reconcile_outstanding_credits
             ):
@@ -125,8 +140,9 @@ def _compute_payment_mode_warning(self):
                     " any outstanding credits."
                 )
             elif (
-                invoice.state == "open"
-                and invoice.payment_move_line_ids
+                invoice.state == "posted"
+                and invoice.payment_state != "paid"
+                and existed_reconciliations
                 and (
                     not invoice.payment_mode_id
                     or not invoice.payment_mode_id.auto_reconcile_outstanding_credits
@@ -137,11 +153,12 @@ def _compute_payment_mode_warning(self):
                     "reconciled payments."
                 )
             elif (
-                invoice.state == "open"
-                and not invoice.payment_move_line_ids
+                invoice.state == "posted"
+                and invoice.payment_state != "paid"
+                and not existed_reconciliations
                 and invoice.payment_mode_id
                 and invoice.payment_mode_id.auto_reconcile_outstanding_credits
-                and invoice.has_outstanding
+                and invoice.invoice_has_outstanding
             ):
                 invoice.payment_mode_warning = _(
                     "Changing payment mode will reconcile outstanding credits."
diff --git a/account_payment_mode_auto_reconcile/models/account_partial_reconcile.py b/account_payment_mode_auto_reconcile/models/account_partial_reconcile.py
index 13f4d08fff..06fb9b3e65 100644
--- a/account_payment_mode_auto_reconcile/models/account_partial_reconcile.py
+++ b/account_payment_mode_auto_reconcile/models/account_partial_reconcile.py
@@ -1,6 +1,6 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class AccountPartialReconcile(models.Model):
@@ -9,8 +9,8 @@ class AccountPartialReconcile(models.Model):
 
     payment_mode_auto_reconcile = fields.Boolean()
 
-    @api.model
     def create(self, vals):
         if self.env.context.get("_payment_mode_auto_reconcile"):
-            vals["payment_mode_auto_reconcile"] = True
+            for val in vals:
+                val["payment_mode_auto_reconcile"] = True
         return super(AccountPartialReconcile, self).create(vals)
diff --git a/account_payment_mode_auto_reconcile/static/description/index.html b/account_payment_mode_auto_reconcile/static/description/index.html
index ab021c9d4d..0e4d341e1a 100644
--- a/account_payment_mode_auto_reconcile/static/description/index.html
+++ b/account_payment_mode_auto_reconcile/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Account Payment Mode Auto Reconcile</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Account Payment Mode Auto Reconcile</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/10.0/account_payment_mode_auto_reconcile"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/account-reconcile-10-0/account-reconcile-10-0-account_payment_mode_auto_reconcile"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/98/10.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/16.0/account_payment_mode_auto_reconcile"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/account-reconcile-16-0/account-reconcile-16-0-account_payment_mode_auto_reconcile"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/account-reconcile&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds a checkbox <cite>auto_reconcile_outstanding_credits</cite> on account
 payment modes to allow automatic reconciliation on account invoices if it is
 checked.</p>
@@ -394,7 +394,7 @@ <h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-reconcile/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_payment_mode_auto_reconcile%0Aversion:%2010.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_payment_mode_auto_reconcile%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -418,7 +418,7 @@ <h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/10.0/account_payment_mode_auto_reconcile">OCA/account-reconcile</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/16.0/account_payment_mode_auto_reconcile">OCA/account-reconcile</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/account_payment_mode_auto_reconcile/tests/test_partner_auto_reconcile.py b/account_payment_mode_auto_reconcile/tests/test_partner_auto_reconcile.py
index 5e592a4a1a..74c647d0fe 100644
--- a/account_payment_mode_auto_reconcile/tests/test_partner_auto_reconcile.py
+++ b/account_payment_mode_auto_reconcile/tests/test_partner_auto_reconcile.py
@@ -1,51 +1,44 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
-import json
 from datetime import date, timedelta
 
-from odoo.tests import SavepointCase
+from odoo.tests import TransactionCase
 from odoo.tools import DEFAULT_SERVER_DATE_FORMAT as DATE_FORMAT
 
 
-class TestPartnerAutoReconcile(SavepointCase):
+class TestPartnerAutoReconcile(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestPartnerAutoReconcile, cls).setUpClass()
         cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
-        cls.acc_rec = cls.env["account.account"].search(
-            [
-                (
-                    "user_type_id",
-                    "=",
-                    cls.env.ref("account.data_account_type_receivable").id,
-                )
-            ],
-            limit=1,
+        cls.acc_rec = cls.env["account.account"].create(
+            {
+                "name": "Receivable",
+                "code": "RECEIVE",
+                "account_type": "asset_receivable",
+                "company_id": cls.env.ref("base.main_company").id,
+            }
         )
-        cls.acc_pay = cls.env["account.account"].search(
-            [
-                (
-                    "user_type_id",
-                    "=",
-                    cls.env.ref("account.data_account_type_payable").id,
-                )
-            ],
-            limit=1,
+        cls.acc_pay = cls.env["account.account"].create(
+            {
+                "name": "Payable",
+                "code": "PAYABLE",
+                "account_type": "liability_payable",
+                "company_id": cls.env.ref("base.main_company").id,
+            }
         )
-        cls.acc_rev = cls.env["account.account"].search(
-            [
-                (
-                    "user_type_id",
-                    "=",
-                    cls.env.ref("account.data_account_type_revenue").id,
-                )
-            ],
-            limit=1,
+        cls.acc_rev = cls.env["account.account"].create(
+            {
+                "name": "Income",
+                "code": "INCOME",
+                "account_type": "income",
+                "company_id": cls.env.ref("base.main_company").id,
+            }
         )
         cls.partner = cls.env["res.partner"].create(
             {
                 "name": "Test partner",
-                "customer": True,
+                "customer_rank": 1,
                 "property_account_receivable_id": cls.acc_rec.id,
                 "property_account_payable_id": cls.acc_pay.id,
             }
@@ -54,12 +47,30 @@ def setUpClass(cls):
         # TODO check why it's not set from demo data
         cls.payment_mode.auto_reconcile_outstanding_credits = True
         cls.product = cls.env.ref("product.consu_delivery_02")
-        cls.invoice = cls.env["account.invoice"].create(
+        cls.journal = cls.env["account.journal"].create(
+            {
+                "name": "BANK",
+                "code": "BANK-TEST",
+                "company_id": cls.env.ref("base.main_company").id,
+                "type": "bank",
+            }
+        )
+
+        cls.sale_journal = cls.env["account.journal"].create(
+            {
+                "name": "SALE-TEST",
+                "code": "SALE",
+                "company_id": cls.env.ref("base.main_company").id,
+                "type": "sale",
+            }
+        )
+        cls.invoice = cls.env["account.move"].create(
             {
                 "partner_id": cls.partner.id,
-                "type": "out_invoice",
-                "payment_term_id": cls.env.ref("account.account_payment_term").id,
-                "account_id": cls.acc_rec.id,
+                "move_type": "out_invoice",
+                "invoice_payment_term_id": cls.env.ref(
+                    "account.account_payment_term_immediate"
+                ).id,
                 "invoice_line_ids": [
                     (
                         0,
@@ -75,19 +86,28 @@ def setUpClass(cls):
                 ],
             }
         )
-        cls.invoice.action_invoice_open()
-        cls.bank_journal = cls.env["account.journal"].search(
-            [("type", "=", "bank")], limit=1
-        )
-        cls.invoice.pay_and_reconcile(cls.bank_journal)
+
+        cls.invoice.action_post()
         cls.refund_wiz = (
-            cls.env["account.invoice.refund"]
+            cls.env["account.move.reversal"]
             .with_context(active_ids=cls.invoice.ids)
-            .create({"filter_refund": "refund", "description": "test"})
+            .create(
+                {
+                    "refund_method": "refund",
+                    "move_ids": [cls.invoice.id],
+                    "journal_id": cls.sale_journal.id,
+                }
+            )
+        )
+        refund_id = cls.refund_wiz.reverse_moves().get("res_id")
+        cls.refund = cls.env["account.move"].browse(refund_id)
+        cls.payment = cls.env["account.payment"].create(
+            {
+                "amount": 500.0,
+                "partner_id": cls.partner.id,
+            }
         )
-        refund_id = cls.refund_wiz.invoice_refund().get("domain")[1][2]
-        cls.refund = cls.env["account.invoice"].browse(refund_id)
-        cls.refund.action_invoice_open()
+        cls.payment.action_post()
         cls.invoice_copy = cls.invoice.copy()
         cls.invoice_copy.write(
             {
@@ -106,7 +126,6 @@ def setUpClass(cls):
                 ]
             }
         )
-        cls.invoice_copy.action_invoice_open()
 
     def test_invoice_validate_auto_reconcile(self):
         auto_rec_invoice = self.invoice.copy(
@@ -114,101 +133,90 @@ def test_invoice_validate_auto_reconcile(self):
                 "payment_mode_id": self.payment_mode.id,
             }
         )
-        auto_rec_invoice.write(
-            {
-                "invoice_line_ids": [
-                    (
-                        0,
-                        0,
-                        {
-                            "product_id": self.product.id,
-                            "name": self.product.name,
-                            "price_unit": 500.0,
-                            "quantity": 1,
-                            "account_id": self.acc_rev.id,
-                        },
-                    )
-                ]
-            }
-        )
+        auto_rec_invoice.action_post()
         self.assertTrue(self.payment_mode.auto_reconcile_outstanding_credits)
-        self.assertEqual(self.invoice_copy.residual, 1500)
-        auto_rec_invoice.action_invoice_open()
-        self.assertEqual(auto_rec_invoice.residual, 500)
+        self.assertEqual(self.invoice_copy.amount_residual, 1725.0)
+        self.assertEqual(auto_rec_invoice.amount_residual, 650.0)
 
     def test_invoice_change_auto_reconcile(self):
-        self.assertEqual(self.invoice_copy.residual, 1500)
+        self.assertEqual(self.invoice_copy.amount_residual, 1725.0)
         self.invoice_copy.write({"payment_mode_id": self.payment_mode.id})
-        self.assertEqual(self.invoice_copy.residual, 500)
+        self.invoice_copy.action_post()
+        # Reconcile 500 from payment
+        self.assertEqual(self.invoice_copy.amount_residual, 1225.0)
+        self.invoice_copy.button_draft()
         self.invoice_copy.write({"payment_mode_id": False})
-        self.assertEqual(self.invoice_copy.residual, 1500)
+        self.invoice_copy.action_post()
+        self.assertEqual(self.invoice_copy.amount_residual, 1725.0)
         # Copy the refund so there's more outstanding credit than invoice total
         new_refund = self.refund.copy()
         new_refund.date = (date.today() + timedelta(days=1)).strftime(DATE_FORMAT)
         new_refund.invoice_line_ids.write({"price_unit": 1200})
-        new_refund.action_invoice_open()
+        new_refund.action_post()
         # Set reconcile partial to False
         self.payment_mode.auto_reconcile_allow_partial = False
         self.assertFalse(self.payment_mode.auto_reconcile_allow_partial)
         self.invoice_copy.write({"payment_mode_id": self.payment_mode.id})
         # Only the older move is used as payment
-        self.assertEqual(self.invoice_copy.residual, 500)
+        self.assertEqual(self.invoice_copy.amount_residual, 1225.0)
         self.invoice_copy.write({"payment_mode_id": False})
-        self.assertEqual(self.invoice_copy.residual, 1500)
+        self.assertEqual(self.invoice_copy.amount_residual, 1725.0)
         # Set allow partial will reconcile both moves
         self.payment_mode.auto_reconcile_allow_partial = True
         self.invoice_copy.write({"payment_mode_id": self.payment_mode.id})
-        self.assertEqual(self.invoice_copy.state, "paid")
-        self.assertEqual(self.invoice_copy.residual, 0)
+        self.assertEqual(self.invoice_copy.state, "posted")
+        self.assertEqual(self.invoice_copy.amount_residual, 0)
 
     def test_invoice_auto_unreconcile(self):
         # Copy the refund so there's more outstanding credit than invoice total
         new_refund = self.refund.copy()
         new_refund.date = (date.today() + timedelta(days=1)).strftime(DATE_FORMAT)
         new_refund.invoice_line_ids.write({"price_unit": 1200})
-        new_refund.action_invoice_open()
-
+        new_refund.action_post()
         auto_rec_invoice = self.invoice.copy(
             {
                 "payment_mode_id": self.payment_mode.id,
             }
         )
         auto_rec_invoice.invoice_line_ids.write({"price_unit": 800})
-        auto_rec_invoice.action_invoice_open()
-        self.assertEqual(auto_rec_invoice.state, "paid")
-        self.assertEqual(auto_rec_invoice.residual, 0)
-        # As we had 2200 of outstanding credits and 800 was assigned, there's
-        # 1400 left
+        auto_rec_invoice.action_post()
+        self.assertEqual(auto_rec_invoice.payment_state, "paid")
+        self.assertEqual(auto_rec_invoice.amount_residual, 0)
+        # As we had 1880 (500 for payment and 1200 + 15% of new_fund) of
+        # outstanding credits and 920 was assigned, there's 960 left
+
         self.assertTrue(self.payment_mode.auto_reconcile_allow_partial)
         self.invoice_copy.write({"payment_mode_id": self.payment_mode.id})
-        self.assertEqual(self.invoice_copy.residual, 100)
+        self.invoice_copy.action_post()
+        self.assertEqual(self.invoice_copy.amount_residual, 765.0)
         # Unreconcile of an invoice doesn't change the reconciliation of the
         # other invoice
+        self.invoice_copy.button_draft()
         self.invoice_copy.write({"payment_mode_id": False})
-        self.assertEqual(self.invoice_copy.residual, 1500)
-        self.assertEqual(auto_rec_invoice.state, "paid")
-        self.assertEqual(auto_rec_invoice.residual, 0)
+        self.assertEqual(self.invoice_copy.amount_residual, 1725.0)
+        self.assertEqual(auto_rec_invoice.state, "posted")
+        self.assertEqual(auto_rec_invoice.amount_residual, 0)
 
     def test_invoice_auto_unreconcile_only_auto_reconcile(self):
         refund = self.refund.copy()
         refund.invoice_line_ids.write({"price_unit": 100})
-        refund.action_invoice_open()
+        refund.action_post()
         new_invoice = self.invoice_copy.copy()
-        new_invoice.action_invoice_open()
+        new_invoice.action_post()
         # Only reconcile 1000 refund manually
-        new_invoice_credits = json.loads(
-            new_invoice.outstanding_credits_debits_widget
-        ).get("content")
+        new_invoice_credits = new_invoice.invoice_outstanding_credits_debits_widget.get(
+            "content"
+        )
         for cred in new_invoice_credits:
-            if cred.get("amount") == 100.0:
-                new_invoice.assign_outstanding_credit(cred.get("id"))
-        self.assertEqual(new_invoice.residual, 1400.0)
-        # Assign payment mode adds the outstanding credit of 1000.0
+            if cred.get("amount") == 115.0:
+                new_invoice.js_assign_outstanding_line(cred.get("id"))
+        self.assertEqual(new_invoice.amount_residual, 1610.0)
+        # Assign payment mode adds the outstanding credit of 500
         new_invoice.write({"payment_mode_id": self.payment_mode.id})
-        self.assertEqual(new_invoice.residual, 400.0)
+        self.assertEqual(round(new_invoice.amount_residual, 2), 1110.0)
         # Remove payment mode only removes automatically added credit
         new_invoice.write({"payment_mode_id": False})
-        self.assertEqual(new_invoice.residual, 1400.0)
+        self.assertEqual(new_invoice.amount_residual, 1610.0)
 
         # use the same payment partially on different invoices.
         other_invoice = self.invoice.copy()
@@ -222,17 +230,18 @@ def test_invoice_auto_unreconcile_only_auto_reconcile(self):
                 "payment_mode_id": self.payment_mode.id,
             }
         )
-        other_invoice.action_invoice_open()
-        self.assertEqual(other_invoice.state, "paid")
-        # since 200 were assigned on other invoice adding auto-rec payment mode
-        # on new_invoice will reconcile 800 and residual will be 600
+        other_invoice.action_post()
+        self.assertEqual(other_invoice.state, "posted")
+        # since 230 (200 + 15% VAT) were assigned on other invoice adding
+        # auto-rec payment mode on new_invoice will reconcile 270
+        # and residual will be 1340.0
         new_invoice.write({"payment_mode_id": self.payment_mode.id})
-        self.assertEqual(new_invoice.residual, 600.0)
+        self.assertEqual(new_invoice.amount_residual, 1340.0)
         # Removing the payment mode should not remove the partial payment on
-        #  the other invoice
+        # the other invoice
         new_invoice.write({"payment_mode_id": False})
-        self.assertEqual(new_invoice.residual, 1400.0)
-        self.assertEqual(other_invoice.state, "paid")
+        self.assertEqual(new_invoice.amount_residual, 1610.0)
+        self.assertEqual(other_invoice.state, "posted")
 
     def test_invoice_auto_reconcile_same_journal(self):
         """Check reconciling credits on same journal."""
@@ -242,27 +251,31 @@ def test_invoice_auto_reconcile_same_journal(self):
                 "payment_mode_id": self.payment_mode.id,
             }
         )
-        auto_rec_invoice.write(
+
+        payment_method_line = self.env["account.payment.method.line"].search(
+            [
+                ("code", "=", "manual"),
+                ("payment_type", "=", "inbound"),
+                ("journal_id", "=", self.journal.id),
+            ]
+        )
+        self.invoice.journal_id.inbound_payment_method_line_ids = [
+            payment_method_line.id
+        ]
+
+        payment_same_journal = self.env["account.payment"].create(
             {
-                "invoice_line_ids": [
-                    (
-                        0,
-                        0,
-                        {
-                            "product_id": self.product.id,
-                            "name": self.product.name,
-                            "price_unit": 500.0,
-                            "quantity": 1,
-                            "account_id": self.acc_rev.id,
-                        },
-                    )
-                ]
+                "amount": 500.0,
+                "partner_id": self.partner.id,
+                "journal_id": auto_rec_invoice.journal_id.id,
             }
         )
+        payment_same_journal.action_post()
+
         self.assertTrue(self.payment_mode.auto_reconcile_outstanding_credits)
-        self.assertEqual(self.invoice_copy.residual, 1500)
-        auto_rec_invoice.action_invoice_open()
-        self.assertEqual(auto_rec_invoice.residual, 500)
+        self.assertEqual(self.invoice_copy.amount_residual, 1725.0)
+        auto_rec_invoice.action_post()
+        self.assertEqual(auto_rec_invoice.amount_residual, 650)
 
     def test_invoice_auto_reconcile_different_journal(self):
         """Check not reconciling credits on different journal."""
@@ -270,27 +283,17 @@ def test_invoice_auto_reconcile_different_journal(self):
         auto_rec_invoice = self.invoice.copy(
             {
                 "payment_mode_id": self.payment_mode.id,
-                "journal_id": self.bank_journal.id,
+                "journal_id": self.sale_journal.id,
             }
         )
-        auto_rec_invoice.write(
+        payment_different_journal = self.env["account.payment"].create(
             {
-                "invoice_line_ids": [
-                    (
-                        0,
-                        0,
-                        {
-                            "product_id": self.product.id,
-                            "name": self.product.name,
-                            "price_unit": 500.0,
-                            "quantity": 1,
-                            "account_id": self.acc_rev.id,
-                        },
-                    )
-                ]
+                "amount": 500.0,
+                "partner_id": self.partner.id,
             }
         )
+        payment_different_journal.action_post()
+        auto_rec_invoice.action_post()
         self.assertTrue(self.payment_mode.auto_reconcile_outstanding_credits)
-        self.assertEqual(self.invoice_copy.residual, 1500)
-        auto_rec_invoice.action_invoice_open()
-        self.assertEqual(auto_rec_invoice.residual, 1500)
+        self.assertEqual(self.invoice_copy.amount_residual, 1725.0)
+        self.assertEqual(auto_rec_invoice.amount_residual, 1150.0)
diff --git a/account_payment_mode_auto_reconcile/views/account_invoice.xml b/account_payment_mode_auto_reconcile/views/account_invoice.xml
index 0c0f812228..81f63bb2b5 100644
--- a/account_payment_mode_auto_reconcile/views/account_invoice.xml
+++ b/account_payment_mode_auto_reconcile/views/account_invoice.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="invoice_form_inherit" model="ir.ui.view">
-        <field name="name">account_payment_partner.invoice_form.inherit</field>
-        <field name="model">account.invoice</field>
-        <field name="inherit_id" ref="account_payment_partner.invoice_form" />
+    <record id="view_move_form_inherit" model="ir.ui.view">
+        <field name="name">account_payment_partner_view_move_form_inherit</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account_payment_partner.view_move_form" />
         <field name="arch" type="xml">
             <field name="payment_mode_id" position="before">
-                <field name="display_payment_mode_warning" invisible="True" />"
+                <field name="display_payment_mode_warning" invisible="True" />
             </field>
             <field name="payment_mode_id" position="after">
                 <label for="payment_mode_warning" invisible="True" />
                 <div
-                    class="alert alert-warning oe_edit_only"
+                    colspan="2"
+                    style="padding-top:0px; padding-left:0px"
+                    class="alert oe_edit_only"
                     attrs="{'invisible': [('display_payment_mode_warning', '!=', True)]}"
+                    role="alert"
                 >
                     <field name="payment_mode_warning" nolabel="1" />
                 </div>
diff --git a/setup/account_payment_mode_auto_reconcile/odoo/__init__.py b/setup/account_payment_mode_auto_reconcile/odoo/__init__.py
deleted file mode 100644
index de40ea7ca0..0000000000
--- a/setup/account_payment_mode_auto_reconcile/odoo/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/setup/account_payment_mode_auto_reconcile/odoo/addons/__init__.py b/setup/account_payment_mode_auto_reconcile/odoo/addons/__init__.py
deleted file mode 100644
index de40ea7ca0..0000000000
--- a/setup/account_payment_mode_auto_reconcile/odoo/addons/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)