diff --git a/account_reconcile_model_strict_match_amount/README.rst b/account_reconcile_model_strict_match_amount/README.rst new file mode 100644 index 00000000..987660a1 --- /dev/null +++ b/account_reconcile_model_strict_match_amount/README.rst @@ -0,0 +1,76 @@ +================================================ +Account Reconciliation Model Strict Match Amount +================================================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :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/13.0/account_reconcile_model_strict_match_amount + :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-13-0/account-reconcile-13-0-account_reconcile_model_strict_match_amount + :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/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to cancel the bypassing of Amount Matching feature on +Reconciliation models "in case of a statement line communication matching +exactly existing entries", to ensure only statement lines matching the total +amount (or according to its percentage) will be reconciled automatically. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub 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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Camptocamp + +Contributors +~~~~~~~~~~~~ + +* Akim Juillerat + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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 `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_reconcile_model_strict_match_amount/__manifest__.py b/account_reconcile_model_strict_match_amount/__manifest__.py index c3c7b495..b5ed811d 100644 --- a/account_reconcile_model_strict_match_amount/__manifest__.py +++ b/account_reconcile_model_strict_match_amount/__manifest__.py @@ -3,13 +3,13 @@ { "name": "Account Reconciliation Model Strict Match Amount", "summary": "Restrict reconciliation propositions to matching amount parameter", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "category": "Accounting", "website": "https://github.com/OCA/account-reconcile", "author": "Camptocamp, Odoo Community Association (OCA)", "license": "AGPL-3", "application": False, "installable": True, - "depends": ["account",], - "data": ["views/account_reconcile_model.xml",], + "depends": ["account"], + "data": ["views/account_reconcile_model.xml"], } diff --git a/account_reconcile_model_strict_match_amount/i18n/account_reconcile_model_strict_match_amount.pot b/account_reconcile_model_strict_match_amount/i18n/account_reconcile_model_strict_match_amount.pot new file mode 100644 index 00000000..0710fd74 --- /dev/null +++ b/account_reconcile_model_strict_match_amount/i18n/account_reconcile_model_strict_match_amount.pot @@ -0,0 +1,32 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_model_strict_match_amount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_reconcile_model_strict_match_amount +#: model:ir.model.fields,help:account_reconcile_model_strict_match_amount.field_account_reconcile_model__strict_match_total_amount +msgid "" +"Avoid bypassing the Amount Matching parameter in case of a statement line " +"communication matching exactly existing entries." +msgstr "" + +#. module: account_reconcile_model_strict_match_amount +#: model:ir.model,name:account_reconcile_model_strict_match_amount.model_account_reconcile_model +msgid "" +"Preset to create journal entries during a invoices and payments matching" +msgstr "" + +#. module: account_reconcile_model_strict_match_amount +#: model:ir.model.fields,field_description:account_reconcile_model_strict_match_amount.field_account_reconcile_model__strict_match_total_amount +msgid "Strict Amount Matching" +msgstr "" diff --git a/account_reconcile_model_strict_match_amount/models/account_reconcile_model.py b/account_reconcile_model_strict_match_amount/models/account_reconcile_model.py index 8bb38216..16e1a17d 100644 --- a/account_reconcile_model_strict_match_amount/models/account_reconcile_model.py +++ b/account_reconcile_model_strict_match_amount/models/account_reconcile_model.py @@ -1,6 +1,6 @@ # Copyright 2020 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 AccountReconcileModel(models.Model): @@ -13,26 +13,36 @@ class AccountReconcileModel(models.Model): "statement line communication matching exactly existing entries.", ) - @api.multi + # flake8: noqa + def _get_select_communication_flag(self): if not self.match_total_amount or not self.strict_match_total_amount: return super()._get_select_communication_flag() else: - regexp = r"'[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+'" return r""" - -- Determine a matching or not with the statement line communication using the move.name or move.ref. - -- only digits are considered and reference are split by any space characters + -- Determine a matching or not with the statement line communication using the aml.name, move.name or move.ref. COALESCE( - regexp_split_to_array(substring(REGEXP_REPLACE(move.name, {regexp}) - && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.name, {regexp}) - OR - ( - move.ref IS NOT NULL - AND - regexp_split_to_array(substring(REGEXP_REPLACE(move.ref, {regexp}) - && - regexp_split_to_array(substring(REGEXP_REPLACE(st_line.name, {regexp}) - ), FALSE) + ( + aml.name IS NOT NULL + AND + substring(REGEXP_REPLACE(aml.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*') != '' + AND + regexp_split_to_array(substring(REGEXP_REPLACE(aml.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'),'\s+') + && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') + ) + OR + regexp_split_to_array(substring(REGEXP_REPLACE(move.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'),'\s+') + && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') + OR + ( + move.ref IS NOT NULL + AND + substring(REGEXP_REPLACE(move.ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*') != '' + AND + regexp_split_to_array(substring(REGEXP_REPLACE(move.ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'),'\s+') + && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') + ) + , FALSE) AND CASE WHEN abs(st_line.amount) < abs(aml.balance) THEN abs(st_line.amount) / abs(aml.balance) * 100 @@ -40,5 +50,27 @@ class AccountReconcileModel(models.Model): ELSE 100 END >= {match_total_amount_param} AS communication_flag """.format( - regexp=regexp, match_total_amount_param=self.match_total_amount_param + match_total_amount_param=self.match_total_amount_param + ) + + def _get_select_payment_reference_flag(self): + if not self.match_total_amount or not self.strict_match_total_amount: + return super()._get_select_payment_reference_flag() + else: + return r""" + -- Determine a matching or not with the statement line communication using the move.invoice_payment_ref. + COALESCE + ( + move.invoice_payment_ref IS NOT NULL + AND + regexp_replace(move.invoice_payment_ref, '\s+', '', 'g') = regexp_replace(st_line.name, '\s+', '', 'g') + , FALSE) + AND + CASE + WHEN abs(st_line.amount) < abs(aml.balance) THEN abs(st_line.amount) / abs(aml.balance) * 100 + WHEN abs(st_line.amount) > abs(aml.balance) THEN abs(aml.balance) / abs(st_line.amount) * 100 + ELSE 100 + END >= {match_total_amount_param} AS payment_reference_flag + """.format( + match_total_amount_param=self.match_total_amount_param ) diff --git a/account_reconcile_model_strict_match_amount/static/description/icon.png b/account_reconcile_model_strict_match_amount/static/description/icon.png new file mode 100644 index 00000000..3a0328b5 Binary files /dev/null and b/account_reconcile_model_strict_match_amount/static/description/icon.png differ diff --git a/account_reconcile_model_strict_match_amount/static/description/index.html b/account_reconcile_model_strict_match_amount/static/description/index.html new file mode 100644 index 00000000..1ce527a7 --- /dev/null +++ b/account_reconcile_model_strict_match_amount/static/description/index.html @@ -0,0 +1,422 @@ + + + + + + +Account Reconciliation Model Strict Match Amount + + + +
+

Account Reconciliation Model Strict Match Amount

+ + +

Beta License: AGPL-3 OCA/account-reconcile Translate me on Weblate Try me on Runbot

+

This module allows to cancel the bypassing of Amount Matching feature on +Reconciliation models “in case of a statement line communication matching +exactly existing entries”, to ensure only statement lines matching the total +amount (or according to its percentage) will be reconciled automatically.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub 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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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 project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/account_reconcile_model_strict_match_amount/tests/test_account_reconcile_model_strict_match_amount.py b/account_reconcile_model_strict_match_amount/tests/test_account_reconcile_model_strict_match_amount.py index ca7f5d8a..c9582be6 100644 --- a/account_reconcile_model_strict_match_amount/tests/test_account_reconcile_model_strict_match_amount.py +++ b/account_reconcile_model_strict_match_amount/tests/test_account_reconcile_model_strict_match_amount.py @@ -6,39 +6,62 @@ from odoo.addons.account.tests.test_reconciliation_matching_rules import ( class TestAccountReconcileModelStrictMatchAmount(TestReconciliationMatchingRules): - def setUp(self): - super().setUp() - self.partner_3 = self.env["res.partner"].create({"name": "partner_3"}) - self.partner_4 = self.env["res.partner"].create({"name": "partner_4"}) - self.invoice_line_5 = self._create_invoice_line( - 150, self.partner_3, "out_invoice" - ) - self.invoice_line_5.ref = "ABC001XYZ" - self.invoice_line_6 = self._create_invoice_line( - 300, self.partner_4, "out_invoice" - ) - self.invoice_line_6.name = "ABC002XYZ" - - self.bank_st_2 = self.env["account.bank.statement"].create( - {"name": "test bank journal 2", "journal_id": self.bank_journal.id,} - ) - - self.bank_line_3 = self.env["account.bank.statement.line"].create( + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.partner_3 = cls.env["res.partner"].create({"name": "partner_3"}) + cls.partner_4 = cls.env["res.partner"].create({"name": "partner_4"}) + cls.partner_5 = cls.env["res.partner"].create({"name": "partner_5"}) + cls.partner_6 = cls.env["res.partner"].create({"name": "partner_6"}) + cls.invoice_line_5 = cls._create_invoice_line(150, cls.partner_3, "out_invoice") + cls.invoice_line_5.ref = "ABC001XYZ" + cls.invoice_line_6 = cls._create_invoice_line(300, cls.partner_4, "out_invoice") + cls.invoice_line_6.name = "ABC002XYZ" + cls.invoice_line_7 = cls._create_invoice_line(450, cls.partner_5, "out_invoice") + cls.invoice_line_7.move_id.ref = "ABC003XYZ" + cls.invoice_line_8 = cls._create_invoice_line(600, cls.partner_6, "out_invoice") + cls.invoice_line_8.move_id.invoice_payment_ref = "ABC004XYZ" + cls.bank_st_2 = cls.env["account.bank.statement"].create( { - "statement_id": self.bank_st_2.id, + "name": "test bank journal 2", + "journal_id": cls.company_data["default_journal_bank"].id, + } + ) + + cls.bank_line_3 = cls.env["account.bank.statement.line"].create( + { + "statement_id": cls.bank_st_2.id, "name": "ABC001XYZ", - "partner_id": self.partner_3.id, - "amount": 70, + "partner_id": cls.partner_3.id, + "amount": 135, "sequence": 1, } ) - self.bank_line_4 = self.env["account.bank.statement.line"].create( + cls.bank_line_4 = cls.env["account.bank.statement.line"].create( { - "statement_id": self.bank_st_2.id, + "statement_id": cls.bank_st_2.id, "name": "ABC002XYZ", - "partner_id": self.partner_4.id, + "partner_id": cls.partner_4.id, "amount": 270, - "sequence": 1, + "sequence": 2, + } + ) + cls.bank_line_5 = cls.env["account.bank.statement.line"].create( + { + "statement_id": cls.bank_st_2.id, + "name": "ABC003XYZ", + "partner_id": cls.partner_5.id, + "amount": 405, + "sequence": 3, + } + ) + cls.bank_line_6 = cls.env["account.bank.statement.line"].create( + { + "statement_id": cls.bank_st_2.id, + "name": "ABC004XYZ", + "partner_id": cls.partner_6.id, + "amount": 540, + "sequence": 4, } ) @@ -49,53 +72,59 @@ class TestAccountReconcileModelStrictMatchAmount(TestReconciliationMatchingRules "rule_type": "invoice_matching", "auto_reconcile": True, "match_nature": "both", - "match_partner": True, "match_same_currency": True, "match_total_amount": True, "match_total_amount_param": 100.0, "strict_match_total_amount": True, - # 'match_partner_ids': [ - # (6, 0, [self.partner_3.id, self.partner_4.id]) - # ], } ) - self._check_statement_matching( my_rule, { self.bank_line_3.id: {"aml_ids": []}, self.bank_line_4.id: {"aml_ids": []}, + self.bank_line_5.id: {"aml_ids": []}, + self.bank_line_6.id: {"aml_ids": []}, }, statements=self.bank_st_2, ) - def test_auto_reconcile_strict_match_80(self): + def test_auto_reconcile_strict_match_90(self): my_rule = self.env["account.reconcile.model"].create( { - "name": "Strict Invoice matching amount 80%", + "name": "Strict Invoice matching amount 90%", "rule_type": "invoice_matching", "auto_reconcile": True, "match_nature": "both", - "match_partner": True, "match_same_currency": True, "match_total_amount": True, - "match_total_amount_param": 80.0, + "match_total_amount_param": 90.0, "strict_match_total_amount": True, - # 'match_partner_ids': [ - # (6, 0, [self.partner_3.id, self.partner_4.id]) - # ], } ) - self._check_statement_matching( my_rule, { - self.bank_line_3.id: {"aml_ids": []}, + self.bank_line_3.id: { + "aml_ids": [self.invoice_line_5.id], + "model": my_rule, + "status": "reconciled", + }, self.bank_line_4.id: { "aml_ids": [self.invoice_line_6.id], "model": my_rule, "status": "reconciled", }, + self.bank_line_5.id: { + "aml_ids": [self.invoice_line_7.id], + "model": my_rule, + "status": "reconciled", + }, + self.bank_line_6.id: { + "aml_ids": [self.invoice_line_8.id], + "model": my_rule, + "status": "reconciled", + }, }, statements=self.bank_st_2, ) diff --git a/account_reconcile_model_strict_match_amount/views/account_reconcile_model.xml b/account_reconcile_model_strict_match_amount/views/account_reconcile_model.xml index 6ee06211..a55833fe 100644 --- a/account_reconcile_model_strict_match_amount/views/account_reconcile_model.xml +++ b/account_reconcile_model_strict_match_amount/views/account_reconcile_model.xml @@ -12,7 +12,7 @@ />