[MIG] account_payment_mode_auto_reconcile: Migrate to version 16.0

account_payment_mode_auto_reconcile/README.rst

@@ -2,10 +2,13 @@
 Account Payment Mode Auto Reconcile
 ===================================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:902d568e59e5a39571d93111bf87a096fdc41ff0866a796d2a15b339d3b0fc85
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -14,16 +17,16 @@ 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/builds?repo=OCA/account-reconcile&target_branch=16.0
+    :alt: Try me on Runboat
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 This module adds a checkbox `auto_reconcile_outstanding_credits` on account
 payment modes to allow automatic reconciliation on account invoices if it is
@@ -47,8 +50,8 @@ 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**>`_.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`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 +81,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.

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)",

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

account_payment_mode_auto_reconcile/models/account_invoice.py → account_payment_mode_auto_reconcile/models/account_move.py

@@ -1,32 +1,26 @@
 # 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",
     )
     display_payment_mode_warning = fields.Boolean(
         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,50 +30,60 @@ 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(
                         _payment_mode_auto_reconcile=True
                     ).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 +93,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 +142,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 +155,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."

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)