odoo-addon-account-reconcile-oca 16.0.2.0.10__py3-none-any.whl → 16.0.2.0.12__py3-none-any.whl

odoo/addons/account_reconcile_oca/README.rst

@@ -7,7 +7,7 @@ Account Reconcile Oca
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:ad9ff54d8570f63151c6f78de071d8152d8011f5fc605206a1382e0ba5b35b23
+   !! source digest: sha256:57146c81c00126d519793a3149f4a98383900249f9dd2525aa71b551bde4ec02
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/account_reconcile_oca/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Account Reconcile Oca",
     "summary": """
         Reconcile addons for Odoo CE accounting""",
-    "version": "16.0.2.0.10",
+    "version": "16.0.2.0.12",
     "license": "AGPL-3",
     "author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)",
     "maintainers": ["etobella"],

odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py

@@ -296,6 +296,46 @@ class AccountBankStatementLine(models.Model):
             != line.get("partner_id")
         )
 
+    def _get_manual_delete_vals(self):
+        return {
+            "manual_reference": False,
+            "manual_account_id": False,
+            "manual_amount": False,
+            "manual_exchange_counterpart": False,
+            "manual_in_currency_id": False,
+            "manual_in_currency": False,
+            "manual_name": False,
+            "manual_partner_id": False,
+            "manual_line_id": False,
+            "manual_move_id": False,
+            "manual_move_type": False,
+            "manual_kind": False,
+            "manual_original_amount": False,
+            "manual_currency_id": False,
+            "analytic_distribution": False,
+        }
+
+    def _process_manual_reconcile_from_line(self, line):
+        self.manual_account_id = line["account_id"][0]
+        self.manual_amount = line["amount"]
+        self.manual_currency_id = line["currency_id"]
+        self.manual_in_currency_id = line.get("line_currency_id")
+        self.manual_in_currency = line.get("line_currency_id") and line[
+            "currency_id"
+        ] != line.get("line_currency_id")
+        self.manual_amount_in_currency = line.get("currency_amount")
+        self.manual_name = line["name"]
+        self.manual_exchange_counterpart = line.get("is_exchange_counterpart", False)
+        self.manual_partner_id = line.get("partner_id") and line["partner_id"][0]
+        manual_line = self.env["account.move.line"].browse(line["id"]).exists()
+        self.manual_line_id = manual_line
+        self.analytic_distribution = line.get("analytic_distribution", {})
+        if self.manual_line_id:
+            self.manual_move_id = self.manual_line_id.move_id
+            self.manual_move_type = self.manual_line_id.move_id.move_type
+        self.manual_kind = line["kind"]
+        self.manual_original_amount = line.get("original_amount", 0.0)
+
     @api.onchange("manual_reference", "manual_delete")
     def _onchange_manual_reconcile_reference(self):
         self.ensure_one()
@@ -316,53 +356,10 @@ class AccountBankStatementLine(models.Model):
                 continue
             if line["reference"] == self.manual_reference:
                 if self.manual_delete:
-                    self.update(
-                        {
-                            "manual_reference": False,
-                            "manual_account_id": False,
-                            "manual_amount": False,
-                            "manual_exchange_counterpart": False,
-                            "manual_in_currency_id": False,
-                            "manual_in_currency": False,
-                            "manual_name": False,
-                            "manual_partner_id": False,
-                            "manual_line_id": False,
-                            "manual_move_id": False,
-                            "manual_move_type": False,
-                            "manual_kind": False,
-                            "manual_original_amount": False,
-                            "manual_currency_id": False,
-                            "analytic_distribution": False,
-                            "manual_amount_in_currency": False,
-                        }
-                    )
+                    self.update(self._get_manual_delete_vals())
                     continue
                 else:
-                    self.manual_account_id = line["account_id"][0]
-                    self.manual_amount = line["amount"]
-                    self.manual_currency_id = line["currency_id"]
-                    self.manual_in_currency_id = line.get("line_currency_id")
-                    self.manual_in_currency = line.get("line_currency_id") and line[
-                        "currency_id"
-                    ] != line.get("line_currency_id")
-                    self.manual_amount_in_currency = line.get("currency_amount")
-                    self.manual_name = line["name"]
-                    self.manual_exchange_counterpart = line.get(
-                        "is_exchange_counterpart", False
-                    )
-                    self.manual_partner_id = (
-                        line.get("partner_id") and line["partner_id"][0]
-                    )
-                    manual_line = (
-                        self.env["account.move.line"].browse(line["id"]).exists()
-                    )
-                    self.manual_line_id = manual_line
-                    self.analytic_distribution = line.get("analytic_distribution", {})
-                    if self.manual_line_id:
-                        self.manual_move_id = self.manual_line_id.move_id
-                        self.manual_move_type = self.manual_line_id.move_id.move_type
-                    self.manual_kind = line["kind"]
-                    self.manual_original_amount = line.get("original_amount", 0.0)
+                    self._process_manual_reconcile_from_line(line)
             new_data.append(line)
         self.update({"manual_delete": False})
         self.reconcile_data_info = self._recompute_suspense_line(
@@ -383,6 +380,21 @@ class AccountBankStatementLine(models.Model):
             )
         self._onchange_manual_reconcile_vals()
 
+    def _get_manual_reconcile_vals(self):
+        return {
+            "name": self.manual_name,
+            "partner_id": self.manual_partner_id
+            and self.manual_partner_id.name_get()[0]
+            or (False, self.partner_name),
+            "account_id": self.manual_account_id.name_get()[0]
+            if self.manual_account_id
+            else [False, _("Undefined")],
+            "amount": self.manual_amount,
+            "credit": -self.manual_amount if self.manual_amount < 0 else 0.0,
+            "debit": self.manual_amount if self.manual_amount > 0 else 0.0,
+            "analytic_distribution": self.analytic_distribution,
+        }
+
     @api.onchange(
         "manual_account_id",
         "manual_partner_id",
@@ -397,28 +409,11 @@ class AccountBankStatementLine(models.Model):
         for line in data:
             if line["reference"] == self.manual_reference:
                 if self._check_line_changed(line):
-                    line.update(
-                        {
-                            "name": self.manual_name,
-                            "partner_id": self.manual_partner_id
-                            and self.manual_partner_id.name_get()[0]
-                            or (False, self.partner_name),
-                            "account_id": self.manual_account_id.name_get()[0]
-                            if self.manual_account_id
-                            else [False, _("Undefined")],
-                            "amount": self.manual_amount,
-                            "credit": -self.manual_amount
-                            if self.manual_amount < 0
-                            else 0.0,
-                            "debit": self.manual_amount
-                            if self.manual_amount > 0
-                            else 0.0,
-                            "analytic_distribution": self.analytic_distribution,
-                            "kind": line["kind"]
-                            if line["kind"] != "suspense"
-                            else "other",
-                        }
+                    line_vals = self._get_manual_reconcile_vals()
+                    line_vals["kind"] = (
+                        line["kind"] if line["kind"] != "suspense" else "other"
                     )
+                    line.update(line_vals)
                     if line["kind"] == "liquidity":
                         self._update_move_partner()
             if self.manual_line_id and self.manual_line_id.id == line.get(
@@ -537,7 +532,14 @@ class AccountBankStatementLine(models.Model):
             res = (
                 self.env["account.reconcile.model"]
                 .search(
-                    [("rule_type", "in", ["invoice_matching", "writeoff_suggestion"])]
+                    [
+                        (
+                            "rule_type",
+                            "in",
+                            ["invoice_matching", "writeoff_suggestion"],
+                        ),
+                        ("company_id", "=", self.company_id.id),
+                    ]
                 )
                 ._apply_rules(self, self._retrieve_partner())
             )
@@ -560,6 +562,8 @@ class AccountBankStatementLine(models.Model):
                     )
                     amount -= sum(line.get("amount") for line in line_data)
                     data += line_data
+                if res.get("auto_reconcile"):
+                    self.reconcile_bank_line()
                 return self._recompute_suspense_line(
                     data,
                     reconcile_auxiliary_id,
@@ -750,6 +754,7 @@ class AccountBankStatementLine(models.Model):
         models = self.env["account.reconcile.model"].search(
             [
                 ("rule_type", "in", ["invoice_matching", "writeoff_suggestion"]),
+                ("company_id", "in", result.company_id.ids),
                 ("auto_reconcile", "=", True),
             ]
         )

odoo/addons/account_reconcile_oca/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:ad9ff54d8570f63151c6f78de071d8152d8011f5fc605206a1382e0ba5b35b23
+!! source digest: sha256:57146c81c00126d519793a3149f4a98383900249f9dd2525aa71b551bde4ec02
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" 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 image-reference" 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 image-reference" href="https://github.com/OCA/account-reconcile/tree/16.0/account_reconcile_oca"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-reconcile-16-0/account-reconcile-16-0-account_reconcile_oca"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?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 addon allows to reconcile bank statements and account marked as <cite>reconcile</cite>.</p>

odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py

@@ -10,6 +10,16 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
     @classmethod
     def setUpClass(cls, chart_template_ref=None):
         super().setUpClass(chart_template_ref=chart_template_ref)
+        # Auto-disable reconciliation model created automatically with
+        # generate_account_reconcile_model() to avoid side effects in tests
+        cls.invoice_matching_models = cls.env["account.reconcile.model"].search(
+            [
+                ("rule_type", "=", "invoice_matching"),
+                ("auto_reconcile", "=", True),
+                ("company_id", "=", cls.company.id),
+            ]
+        )
+        cls.invoice_matching_models.active = False
 
         cls.acc_bank_stmt_model = cls.env["account.bank.statement"]
         cls.acc_bank_stmt_line_model = cls.env["account.bank.statement.line"]
@@ -988,6 +998,8 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             }
         )
 
+        self.invoice_matching_models.active = True
+        self.invoice_matching_models.match_text_location_label = False
         bank_stmt_line = self.acc_bank_stmt_line_model.create(
             {
                 "name": "testLine",

{odoo_addon_account_reconcile_oca-16.0.2.0.10.dist-info → odoo_addon_account_reconcile_oca-16.0.2.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_reconcile_oca
-Version: 16.0.2.0.10
+Version: 16.0.2.0.12
 Summary: Reconcile addons for Odoo CE accounting
 Home-page: https://github.com/OCA/account-reconcile
 Author: CreuBlanca,Dixmit,Odoo Community Association (OCA)
@@ -23,7 +23,7 @@ Account Reconcile Oca
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:ad9ff54d8570f63151c6f78de071d8152d8011f5fc605206a1382e0ba5b35b23
+   !! source digest: sha256:57146c81c00126d519793a3149f4a98383900249f9dd2525aa71b551bde4ec02
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_account_reconcile_oca-16.0.2.0.10.dist-info → odoo_addon_account_reconcile_oca-16.0.2.0.12.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/account_reconcile_oca/README.rst,sha256=PiHT2DPyltzkO_Gs3SasKQqnGNKfBq-xQk42SAVJ7qo,3709
+odoo/addons/account_reconcile_oca/README.rst,sha256=-IvPfOXnhsy5BfQQG2E1XA6-19LShQVqsErWEORuKsc,3709
 odoo/addons/account_reconcile_oca/__init__.py,sha256=vqRYeBgCVZMpZhYvILSxVsNLC9V7zDnvxMnKU8RQP94,55
-odoo/addons/account_reconcile_oca/__manifest__.py,sha256=-RrKvYUD1nAau2o7R_oMmCscH5YJSQFXum-Fw4Qwr-8,1827
+odoo/addons/account_reconcile_oca/__manifest__.py,sha256=sWiE9HIZKw2BVpmwID3TkB-zrk8H5j7KDO2sYNyRKfI,1827
 odoo/addons/account_reconcile_oca/hooks.py,sha256=l2-vYiPh-Wu_4Hi3GvfoUmc527S-Jozb07-DbP6LzDA,187
 odoo/addons/account_reconcile_oca/demo/demo.xml,sha256=6k0uK-H1aBiyogVNhQMQfFGL5zUfUGV2M-sSV6LHeUs,204
 odoo/addons/account_reconcile_oca/i18n/account_reconcile_oca.pot,sha256=UOXZfULkd2lLxY1q6OJb-D4C8KqXV1U-7eG_52CP5lU,26737
@@ -18,7 +18,7 @@ odoo/addons/account_reconcile_oca/migrations/16.0.1.2.0/pre-migration.py,sha256=
 odoo/addons/account_reconcile_oca/models/__init__.py,sha256=28wbZjUZa30uHQY10BMJtKQ_BqJgwLQMQvB9uv0H_fY,282
 odoo/addons/account_reconcile_oca/models/account_account_reconcile.py,sha256=Bgp4aHX6nSjm8OaRn380Bf5LcQ-Yo4nFt9CzzlExykc,6780
 odoo/addons/account_reconcile_oca/models/account_bank_statement.py,sha256=CFqlLLtmTqmt5yH3v_pkUfkZezSb1nEhBTu2J5gCjxM,1034
-odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py,sha256=vDJynIUcYCuMrqyZA1LU7dx8Qlgusa-0qpYbjYFXNLs,39557
+odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py,sha256=OMKOf2bgD__HfghDi9XLxlrKY_v7lJdrTqdz4rN0Eek,39188
 odoo/addons/account_reconcile_oca/models/account_journal.py,sha256=prdylwu2cX8MQUCRUGJfPWeCu8R6MNgLvHqPscqwloQ,995
 odoo/addons/account_reconcile_oca/models/account_move_line.py,sha256=yLNHitduzhS5ShrWWw31S5zirIadFsG8ga1gtXehRTc,1213
 odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py,sha256=jRboiVtRZmFBoZB2OQU4FOK4wwv7WLwjtX00XUO3FzA,3916
@@ -30,7 +30,7 @@ odoo/addons/account_reconcile_oca/readme/ROADMAP.rst,sha256=MlQ8cFQmu5MzBoFW2WP_
 odoo/addons/account_reconcile_oca/readme/USAGE.rst,sha256=npPsx_C8T-JuCEJiTK4V44_5Io1j4ltO831T3yHFuCs,396
 odoo/addons/account_reconcile_oca/security/ir.model.access.csv,sha256=XfN2EKOoChlEDonVd5DtodVAQyRbShiJ8nrXx6EwNmM,339
 odoo/addons/account_reconcile_oca/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/account_reconcile_oca/static/description/index.html,sha256=AwaFLqX7oyeReb6yYRrWtEyXLCP1hIp6vj0RSBvtTVs,13829
+odoo/addons/account_reconcile_oca/static/description/index.html,sha256=ECGl2p3vP-cB6BSVpPQmB9tG8GSaHIPJRSXD8ZgXA9U,13829
 odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js,sha256=Q_WFfEwl2q0Nr6cugeIt0ziVTZ7oFxM7UdcPzFP6FEs,4856
 odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_kanban_record.esm.js,sha256=ewNK1VQgFZWccTiyJMKYkOG6KtbHHVnI2pdNy9kjkig,467
 odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_renderer.esm.js,sha256=jm7p1yKiSw7oz32IZ_uwjFOMMz77sxicv-zPomVVt4U,2157
@@ -52,7 +52,7 @@ odoo/addons/account_reconcile_oca/static/src/scss/reconcile.scss,sha256=cQoernco
 odoo/addons/account_reconcile_oca/static/src/xml/reconcile.xml,sha256=sLoq3aN8Rs4Ex9dyEqENhRU9FYT9Cm1R_KrI4zk7FJY,8698
 odoo/addons/account_reconcile_oca/tests/__init__.py,sha256=8JhP4auByShS8Z_Ik5dShMuWdh1kBlYP_DLI4Ku8XWA,79
 odoo/addons/account_reconcile_oca/tests/test_account_reconcile.py,sha256=opQs4FgChPdphc25Jzs07TuYxoVGBCj6IAPueMLNkH0,10576
-odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py,sha256=gEtAaYvbUB4KyKtIkPEVv4RGdJZkO5MCdkrC_niAvGA,44435
+odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py,sha256=BVNygNLWcehjLuTiYrNuOaIHYvJHsdOjbMpi9Q_AFRA,45030
 odoo/addons/account_reconcile_oca/views/account_account.xml,sha256=Z6S9dDF2CnaSl8CYw69dxJiuVznJZzZX2BrhaDeMP3c,916
 odoo/addons/account_reconcile_oca/views/account_account_reconcile.xml,sha256=yGOV7nOj5dVwp09ItOIfvNiBQrO_FpAC36gcnjI98JE,7066
 odoo/addons/account_reconcile_oca/views/account_bank_statement.xml,sha256=e8ojLqYeZaMdTj-F0QdmFST4ICAlaKV66SJPkHXCdEU,2473
@@ -61,7 +61,7 @@ odoo/addons/account_reconcile_oca/views/account_journal.xml,sha256=WQGxMPgl4Um-I
 odoo/addons/account_reconcile_oca/views/account_move.xml,sha256=qMXpycJJfaztyToulMmLY1NF2UDL2lcZM-m1tTiAoRY,995
 odoo/addons/account_reconcile_oca/views/account_move_line.xml,sha256=BfObEwM6vXHMtxOFMOGDdCPOWO4ybz3w1_fm4_ufqM0,5274
 odoo/addons/account_reconcile_oca/views/res_config_settings.xml,sha256=hL06Z_0Eg96LU6ta7VHRaheUDehJ6tVexBjU6X52Vng,1412
-odoo_addon_account_reconcile_oca-16.0.2.0.10.dist-info/METADATA,sha256=UxIwYqJdVF0OHCbkS_sjqwlir2__8xOZx8mpXjCQ0R4,4323
-odoo_addon_account_reconcile_oca-16.0.2.0.10.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-odoo_addon_account_reconcile_oca-16.0.2.0.10.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_account_reconcile_oca-16.0.2.0.10.dist-info/RECORD,,
+odoo_addon_account_reconcile_oca-16.0.2.0.12.dist-info/METADATA,sha256=oX7aUpSsU3wg_5QWNYOGm9tdAHKbEZmk2bGZ1J1KpOE,4323
+odoo_addon_account_reconcile_oca-16.0.2.0.12.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+odoo_addon_account_reconcile_oca-16.0.2.0.12.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_account_reconcile_oca-16.0.2.0.12.dist-info/RECORD,,