From 82000b4085a54d9338ce9d7f3498b20c68634e3f Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Tue, 21 Jan 2020 12:31:20 +0100 Subject: [PATCH 1/8] [ADD] account_reconcile_model_strict_match_amount --- .../__init__.py | 1 + .../__manifest__.py | 19 +++++ .../models/__init__.py | 1 + .../models/account_reconcile_model.py | 42 ++++++++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 4 + .../tests/__init__.py | 1 + ...unt_reconcile_model_strict_match_amount.py | 80 +++++++++++++++++++ .../views/account_reconcile_model.xml | 16 ++++ 9 files changed, 165 insertions(+) create mode 100644 account_reconcile_model_strict_match_amount/__init__.py create mode 100644 account_reconcile_model_strict_match_amount/__manifest__.py create mode 100644 account_reconcile_model_strict_match_amount/models/__init__.py create mode 100644 account_reconcile_model_strict_match_amount/models/account_reconcile_model.py create mode 100644 account_reconcile_model_strict_match_amount/readme/CONTRIBUTORS.rst create mode 100644 account_reconcile_model_strict_match_amount/readme/DESCRIPTION.rst create mode 100644 account_reconcile_model_strict_match_amount/tests/__init__.py create mode 100644 account_reconcile_model_strict_match_amount/tests/test_account_reconcile_model_strict_match_amount.py create mode 100644 account_reconcile_model_strict_match_amount/views/account_reconcile_model.xml diff --git a/account_reconcile_model_strict_match_amount/__init__.py b/account_reconcile_model_strict_match_amount/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/account_reconcile_model_strict_match_amount/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_reconcile_model_strict_match_amount/__manifest__.py b/account_reconcile_model_strict_match_amount/__manifest__.py new file mode 100644 index 00000000..78335557 --- /dev/null +++ b/account_reconcile_model_strict_match_amount/__manifest__.py @@ -0,0 +1,19 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +{ + "name": "Account Reconciliation Model Strict Match Amount", + "summary": "Restrict reconciliation propositions to matching amount parameter", + "version": "12.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", + ], +} diff --git a/account_reconcile_model_strict_match_amount/models/__init__.py b/account_reconcile_model_strict_match_amount/models/__init__.py new file mode 100644 index 00000000..e27d0c6c --- /dev/null +++ b/account_reconcile_model_strict_match_amount/models/__init__.py @@ -0,0 +1 @@ +from . import account_reconcile_model 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 new file mode 100644 index 00000000..fcdc395c --- /dev/null +++ b/account_reconcile_model_strict_match_amount/models/account_reconcile_model.py @@ -0,0 +1,42 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo import api, fields, models + + +class AccountReconcileModel(models.Model): + + _inherit = 'account.reconcile.model' + + strict_match_total_amount = fields.Boolean( + string="Strict Amount Matching", + help="Avoid bypassing the Amount Matching parameter in case of a " + "statement line communication matching exactly existing entries." + ) + + @api.multi + 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 + 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) + 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 communication_flag + '''.format(regexp=regexp, match_total_amount_param=self.match_total_amount_param) diff --git a/account_reconcile_model_strict_match_amount/readme/CONTRIBUTORS.rst b/account_reconcile_model_strict_match_amount/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..e31e2f0c --- /dev/null +++ b/account_reconcile_model_strict_match_amount/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Akim Juillerat diff --git a/account_reconcile_model_strict_match_amount/readme/DESCRIPTION.rst b/account_reconcile_model_strict_match_amount/readme/DESCRIPTION.rst new file mode 100644 index 00000000..0c77d35b --- /dev/null +++ b/account_reconcile_model_strict_match_amount/readme/DESCRIPTION.rst @@ -0,0 +1,4 @@ +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. diff --git a/account_reconcile_model_strict_match_amount/tests/__init__.py b/account_reconcile_model_strict_match_amount/tests/__init__.py new file mode 100644 index 00000000..97a05422 --- /dev/null +++ b/account_reconcile_model_strict_match_amount/tests/__init__.py @@ -0,0 +1 @@ +from . import test_account_reconcile_model_strict_match_amount 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 new file mode 100644 index 00000000..e6c8f518 --- /dev/null +++ b/account_reconcile_model_strict_match_amount/tests/test_account_reconcile_model_strict_match_amount.py @@ -0,0 +1,80 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo.addons.account.tests.test_reconciliation_matching_rules import TestReconciliationMatchingRules + + +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({ + 'statement_id': self.bank_st_2.id, + 'name': 'ABC001XYZ', + 'partner_id': self.partner_3.id, + 'amount': 70, + 'sequence': 1, + }) + self.bank_line_4 = self.env['account.bank.statement.line'].create({ + 'statement_id': self.bank_st_2.id, + 'name': 'ABC002XYZ', + 'partner_id': self.partner_4.id, + 'amount': 270, + 'sequence': 1, + }) + + def test_auto_reconcile_strict_match_100(self): + my_rule = self.env['account.reconcile.model'].create({ + 'name': 'Strict Invoice matching amount 100%', + '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': []}, + }, statements=self.bank_st_2) + + def test_auto_reconcile_strict_match_80(self): + my_rule = self.env['account.reconcile.model'].create({ + 'name': 'Strict Invoice matching amount 80%', + '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, + '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.invoice_line_6.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 new file mode 100644 index 00000000..33fd273b --- /dev/null +++ b/account_reconcile_model_strict_match_amount/views/account_reconcile_model.xml @@ -0,0 +1,16 @@ + + + + account.reconcile.model.form + account.reconcile.model + + + + + + + {'invisible': ['|', '|', ('rule_type', '!=', 'invoice_matching'), ('match_total_amount', '=', False), ('strict_match_total_amount', '=', True)]} + + + + From 4506453ae6a1d4d0916b3cce2ef7a85c682c09b2 Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Wed, 29 Apr 2020 15:03:18 +0200 Subject: [PATCH 2/8] [IMP] account_reconcile_model_strict_match_amount: black, isort, prettier --- .../__manifest__.py | 8 +- .../models/account_reconcile_model.py | 10 +- ...unt_reconcile_model_strict_match_amount.py | 143 ++++++++++-------- .../views/account_reconcile_model.xml | 16 +- 4 files changed, 102 insertions(+), 75 deletions(-) diff --git a/account_reconcile_model_strict_match_amount/__manifest__.py b/account_reconcile_model_strict_match_amount/__manifest__.py index 78335557..c3c7b495 100644 --- a/account_reconcile_model_strict_match_amount/__manifest__.py +++ b/account_reconcile_model_strict_match_amount/__manifest__.py @@ -10,10 +10,6 @@ "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/models/account_reconcile_model.py b/account_reconcile_model_strict_match_amount/models/account_reconcile_model.py index fcdc395c..8bb38216 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 @@ -5,12 +5,12 @@ from odoo import api, fields, models class AccountReconcileModel(models.Model): - _inherit = 'account.reconcile.model' + _inherit = "account.reconcile.model" strict_match_total_amount = fields.Boolean( string="Strict Amount Matching", help="Avoid bypassing the Amount Matching parameter in case of a " - "statement line communication matching exactly existing entries." + "statement line communication matching exactly existing entries.", ) @api.multi @@ -19,7 +19,7 @@ class AccountReconcileModel(models.Model): return super()._get_select_communication_flag() else: regexp = r"'[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+'" - return r''' + 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 COALESCE( @@ -39,4 +39,6 @@ class AccountReconcileModel(models.Model): 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 communication_flag - '''.format(regexp=regexp, match_total_amount_param=self.match_total_amount_param) + """.format( + regexp=regexp, match_total_amount_param=self.match_total_amount_param + ) 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 e6c8f518..ca7f5d8a 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 @@ -1,80 +1,101 @@ # Copyright 2020 Camptocamp SA # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from odoo.addons.account.tests.test_reconciliation_matching_rules import TestReconciliationMatchingRules +from odoo.addons.account.tests.test_reconciliation_matching_rules import ( + TestReconciliationMatchingRules, +) 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.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' + 150, self.partner_3, "out_invoice" ) - self.invoice_line_5.ref = 'ABC001XYZ' + self.invoice_line_5.ref = "ABC001XYZ" self.invoice_line_6 = self._create_invoice_line( - 300, self.partner_4, 'out_invoice' + 300, self.partner_4, "out_invoice" ) - self.invoice_line_6.name = 'ABC002XYZ' + 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_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({ - 'statement_id': self.bank_st_2.id, - 'name': 'ABC001XYZ', - 'partner_id': self.partner_3.id, - 'amount': 70, - 'sequence': 1, - }) - self.bank_line_4 = self.env['account.bank.statement.line'].create({ - 'statement_id': self.bank_st_2.id, - 'name': 'ABC002XYZ', - 'partner_id': self.partner_4.id, - 'amount': 270, - 'sequence': 1, - }) + self.bank_line_3 = self.env["account.bank.statement.line"].create( + { + "statement_id": self.bank_st_2.id, + "name": "ABC001XYZ", + "partner_id": self.partner_3.id, + "amount": 70, + "sequence": 1, + } + ) + self.bank_line_4 = self.env["account.bank.statement.line"].create( + { + "statement_id": self.bank_st_2.id, + "name": "ABC002XYZ", + "partner_id": self.partner_4.id, + "amount": 270, + "sequence": 1, + } + ) def test_auto_reconcile_strict_match_100(self): - my_rule = self.env['account.reconcile.model'].create({ - 'name': 'Strict Invoice matching amount 100%', - '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]) - # ], - }) + my_rule = self.env["account.reconcile.model"].create( + { + "name": "Strict Invoice matching amount 100%", + "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': []}, - }, statements=self.bank_st_2) + self._check_statement_matching( + my_rule, + { + self.bank_line_3.id: {"aml_ids": []}, + self.bank_line_4.id: {"aml_ids": []}, + }, + statements=self.bank_st_2, + ) def test_auto_reconcile_strict_match_80(self): - my_rule = self.env['account.reconcile.model'].create({ - 'name': 'Strict Invoice matching amount 80%', - '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, - 'strict_match_total_amount': True, - # 'match_partner_ids': [ - # (6, 0, [self.partner_3.id, self.partner_4.id]) - # ], - }) + my_rule = self.env["account.reconcile.model"].create( + { + "name": "Strict Invoice matching amount 80%", + "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, + "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.invoice_line_6.id], 'model': my_rule, 'status': 'reconciled'}, - }, statements=self.bank_st_2) + self._check_statement_matching( + my_rule, + { + self.bank_line_3.id: {"aml_ids": []}, + self.bank_line_4.id: { + "aml_ids": [self.invoice_line_6.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 33fd273b..6ee06211 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 @@ -1,4 +1,4 @@ - + account.reconcile.model.form @@ -6,10 +6,18 @@ - + - - {'invisible': ['|', '|', ('rule_type', '!=', 'invoice_matching'), ('match_total_amount', '=', False), ('strict_match_total_amount', '=', True)]} + + {'invisible': ['|', '|', ('rule_type', '!=', 'invoice_matching'), ('match_total_amount', '=', False), ('strict_match_total_amount', '=', True)]} From 0957ce8fb466b41d77b6c3e32933583c556f68e1 Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Wed, 29 Apr 2020 15:05:09 +0200 Subject: [PATCH 3/8] [MIG] account_reconcile_model_strict_match_amount: Migration to 13.0 --- .../README.rst | 76 ++++ .../__manifest__.py | 6 +- ...nt_reconcile_model_strict_match_amount.pot | 32 ++ .../models/account_reconcile_model.py | 64 ++- .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 422 ++++++++++++++++++ ...unt_reconcile_model_strict_match_amount.py | 107 +++-- .../views/account_reconcile_model.xml | 2 +- 8 files changed, 650 insertions(+), 59 deletions(-) create mode 100644 account_reconcile_model_strict_match_amount/README.rst create mode 100644 account_reconcile_model_strict_match_amount/i18n/account_reconcile_model_strict_match_amount.pot create mode 100644 account_reconcile_model_strict_match_amount/static/description/icon.png create mode 100644 account_reconcile_model_strict_match_amount/static/description/index.html 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 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 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 @@ /> Date: Wed, 6 Oct 2021 17:51:56 +0700 Subject: [PATCH 4/8] [IMP] account_reconcile_model_strict_match_amount: black, isort, prettier --- .../odoo/addons/account_reconcile_model_strict_match_amount | 1 + setup/account_reconcile_model_strict_match_amount/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/account_reconcile_model_strict_match_amount/odoo/addons/account_reconcile_model_strict_match_amount create mode 100644 setup/account_reconcile_model_strict_match_amount/setup.py diff --git a/setup/account_reconcile_model_strict_match_amount/odoo/addons/account_reconcile_model_strict_match_amount b/setup/account_reconcile_model_strict_match_amount/odoo/addons/account_reconcile_model_strict_match_amount new file mode 120000 index 00000000..96241da0 --- /dev/null +++ b/setup/account_reconcile_model_strict_match_amount/odoo/addons/account_reconcile_model_strict_match_amount @@ -0,0 +1 @@ +../../../../account_reconcile_model_strict_match_amount \ No newline at end of file diff --git a/setup/account_reconcile_model_strict_match_amount/setup.py b/setup/account_reconcile_model_strict_match_amount/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_reconcile_model_strict_match_amount/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 37f1df724169714c1a59eb3304c5f2e19a695787 Mon Sep 17 00:00:00 2001 From: nguyenhk Date: Wed, 13 Oct 2021 17:15:37 +0700 Subject: [PATCH 5/8] [MIG] account_reconcile_model_strict_match_amount: Migration to 14.0 --- .../README.rst | 17 +++- .../__manifest__.py | 2 +- .../models/account_reconcile_model.py | 19 ++-- .../readme/CONTRIBUTORS.rst | 2 + .../readme/CREDITS.rst | 1 + .../static/description/index.html | 25 +++-- ...unt_reconcile_model_strict_match_amount.py | 98 +++++++++++-------- 7 files changed, 101 insertions(+), 63 deletions(-) create mode 100644 account_reconcile_model_strict_match_amount/readme/CREDITS.rst diff --git a/account_reconcile_model_strict_match_amount/README.rst b/account_reconcile_model_strict_match_amount/README.rst index 987660a1..a3135759 100644 --- a/account_reconcile_model_strict_match_amount/README.rst +++ b/account_reconcile_model_strict_match_amount/README.rst @@ -14,13 +14,13 @@ Account Reconciliation Model Strict Match Amount :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 + :target: https://github.com/OCA/account-reconcile/tree/14.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 + :target: https://translation.odoo-community.org/projects/account-reconcile-14-0/account-reconcile-14-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 + :target: https://runbot.odoo-community.org/runbot/98/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -41,7 +41,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -57,6 +57,13 @@ Contributors ~~~~~~~~~~~~ * Akim Juillerat +* `Trobz `_: + * Nguyen Ho + +Other credits +~~~~~~~~~~~~~ + +The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp Maintainers ~~~~~~~~~~~ @@ -71,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 `_ project on GitHub. +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 b5ed811d..9dcc1875 100644 --- a/account_reconcile_model_strict_match_amount/__manifest__.py +++ b/account_reconcile_model_strict_match_amount/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Account Reconciliation Model Strict Match Amount", "summary": "Restrict reconciliation propositions to matching amount parameter", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "category": "Accounting", "website": "https://github.com/OCA/account-reconcile", "author": "Camptocamp, Odoo Community Association (OCA)", 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 16e1a17d..ed46151b 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 @@ -28,11 +28,12 @@ class AccountReconcileModel(models.Model): 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+') + && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.payment_ref, '[^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+') + && + regexp_split_to_array(substring(REGEXP_REPLACE(st_line.payment_ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') OR ( move.ref IS NOT NULL @@ -40,7 +41,8 @@ class AccountReconcileModel(models.Model): 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+') + && + regexp_split_to_array(substring(REGEXP_REPLACE(st_line.payment_ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') ) , FALSE) AND @@ -48,7 +50,7 @@ class AccountReconcileModel(models.Model): 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 communication_flag + END >= {match_total_amount_param} """.format( match_total_amount_param=self.match_total_amount_param ) @@ -58,19 +60,20 @@ class AccountReconcileModel(models.Model): 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. + -- Determine a matching or not with the statement line communication using the move.payment_reference. COALESCE ( - move.invoice_payment_ref IS NOT NULL + move.payment_reference IS NOT NULL AND - regexp_replace(move.invoice_payment_ref, '\s+', '', 'g') = regexp_replace(st_line.name, '\s+', '', 'g') + regexp_replace(move.payment_reference, '\s+', '', 'g') = + regexp_replace(st_line.payment_ref, '\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 + END >= {match_total_amount_param} """.format( match_total_amount_param=self.match_total_amount_param ) diff --git a/account_reconcile_model_strict_match_amount/readme/CONTRIBUTORS.rst b/account_reconcile_model_strict_match_amount/readme/CONTRIBUTORS.rst index e31e2f0c..ff1c829b 100644 --- a/account_reconcile_model_strict_match_amount/readme/CONTRIBUTORS.rst +++ b/account_reconcile_model_strict_match_amount/readme/CONTRIBUTORS.rst @@ -1 +1,3 @@ * Akim Juillerat +* `Trobz `_: + * Nguyen Ho diff --git a/account_reconcile_model_strict_match_amount/readme/CREDITS.rst b/account_reconcile_model_strict_match_amount/readme/CREDITS.rst new file mode 100644 index 00000000..f37ebe75 --- /dev/null +++ b/account_reconcile_model_strict_match_amount/readme/CREDITS.rst @@ -0,0 +1 @@ +The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp diff --git a/account_reconcile_model_strict_match_amount/static/description/index.html b/account_reconcile_model_strict_match_amount/static/description/index.html index 1ce527a7..22ee33c6 100644 --- a/account_reconcile_model_strict_match_amount/static/description/index.html +++ b/account_reconcile_model_strict_match_amount/static/description/index.html @@ -3,7 +3,7 @@ - + Account Reconciliation Model Strict Match Amount