From 82e5da0ca28428ccb01502cc020eb32c05bd53f9 Mon Sep 17 00:00:00 2001 From: "Ronald Portier (Therp BV)" Date: Fri, 15 Sep 2023 17:58:25 +0200 Subject: [PATCH] [MIG] *_clearing_account: Migration to 16.0 --- account_statement_clearing_account/README.rst | 2 +- account_statement_clearing_account/__manifest__.py | 5 +++-- .../models/account_bank_statement.py | 4 ++-- account_statement_clearing_account/readme/DESCRIPTION.rst | 2 +- .../tests/test_clearing_account.py | 4 ++-- .../odoo/addons/account_bank_statement_import_adyen | 1 - .../odoo/addons/account_statement_import_adyen | 1 + .../setup.py | 0 8 files changed, 10 insertions(+), 9 deletions(-) delete mode 120000 setup/account_bank_statement_import_adyen/odoo/addons/account_bank_statement_import_adyen create mode 120000 setup/account_statement_import_adyen/odoo/addons/account_statement_import_adyen rename setup/{account_bank_statement_import_adyen => account_statement_import_adyen}/setup.py (100%) diff --git a/account_statement_clearing_account/README.rst b/account_statement_clearing_account/README.rst index 830495f80..4f5447e1e 100644 --- a/account_statement_clearing_account/README.rst +++ b/account_statement_clearing_account/README.rst @@ -44,7 +44,7 @@ Known issues ============ This module does not come with its own tests because it depends on a statement filter being installed. Instead, it is tested in -`account_bank_statement_import_adyen` +`account_statement_import_adyen` **Table of contents** diff --git a/account_statement_clearing_account/__manifest__.py b/account_statement_clearing_account/__manifest__.py index d52698003..ba09328f0 100644 --- a/account_statement_clearing_account/__manifest__.py +++ b/account_statement_clearing_account/__manifest__.py @@ -1,10 +1,11 @@ # Copyright 2017 Opener BV () # Copyright 2020 Vanmoof BV () +# Copyright 2023 Therp BV . # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "Reconcile entries from pseudo bank statements", - "version": "13.0.1.0.0", - "author": "Opener B.V., Vanmoof BV, Odoo Community Association (OCA)", + "version": "16.0.1.0.0", + "author": "Opener B.V., Vanmoof BV, Therp BV, Odoo Community Association (OCA)", "category": "Banking addons", "website": "https://github.com/OCA/bank-statement-import", "license": "AGPL-3", diff --git a/account_statement_clearing_account/models/account_bank_statement.py b/account_statement_clearing_account/models/account_bank_statement.py index 1b100293c..39bc044b5 100644 --- a/account_statement_clearing_account/models/account_bank_statement.py +++ b/account_statement_clearing_account/models/account_bank_statement.py @@ -72,7 +72,7 @@ def unreconcile_clearing_account(self): def button_reopen(self): """When setting the statement back to draft, unreconcile the reconciliation on the clearing account""" - res = super(BankStatement, self).button_reopen() + res = super().button_reopen() for statement in self: statement.unreconcile_clearing_account() return res @@ -80,7 +80,7 @@ def button_reopen(self): def button_confirm_bank(self): """When confirming the statement, trigger the reconciliation of the lines on the clearing account (if applicable)""" - res = super(BankStatement, self).button_confirm_bank() + res = super().button_confirm_bank() for statement in self: statement.reconcile_clearing_account() return res diff --git a/account_statement_clearing_account/readme/DESCRIPTION.rst b/account_statement_clearing_account/readme/DESCRIPTION.rst index 7043715ff..5d54843a1 100644 --- a/account_statement_clearing_account/readme/DESCRIPTION.rst +++ b/account_statement_clearing_account/readme/DESCRIPTION.rst @@ -17,4 +17,4 @@ Known issues ============ This module does not come with its own tests because it depends on a statement filter being installed. Instead, it is tested in -`account_bank_statement_import_adyen` +`account_statement_import_adyen` diff --git a/account_statement_clearing_account/tests/test_clearing_account.py b/account_statement_clearing_account/tests/test_clearing_account.py index e698da0a6..286203144 100644 --- a/account_statement_clearing_account/tests/test_clearing_account.py +++ b/account_statement_clearing_account/tests/test_clearing_account.py @@ -1,6 +1,6 @@ # Copyright 2017 Opener BV # Copyright 2020 Vanmoof BV -# Copyright 2015-2021 Therp BV ) +# Copyright 2015-2023 Therp BV ) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo.tests.common import SavepointCase @@ -18,7 +18,7 @@ def setUpClass(cls): "currency_id": cls.env.ref("base.USD").id, } ) - cls.partner_customer = cls.env["res.partner"].create({"name": "cutomer"}) + cls.partner_customer = cls.env["res.partner"].create({"name": "customer"}) cls.partner_provider = cls.env["res.partner"].create({"name": "provider"}) # Enable reconcilation on the default journal account to trigger # the functionality from account_bank_statement_clearing_account diff --git a/setup/account_bank_statement_import_adyen/odoo/addons/account_bank_statement_import_adyen b/setup/account_bank_statement_import_adyen/odoo/addons/account_bank_statement_import_adyen deleted file mode 120000 index 2e39464ec..000000000 --- a/setup/account_bank_statement_import_adyen/odoo/addons/account_bank_statement_import_adyen +++ /dev/null @@ -1 +0,0 @@ -../../../../account_bank_statement_import_adyen \ No newline at end of file diff --git a/setup/account_statement_import_adyen/odoo/addons/account_statement_import_adyen b/setup/account_statement_import_adyen/odoo/addons/account_statement_import_adyen new file mode 120000 index 000000000..03a0747f3 --- /dev/null +++ b/setup/account_statement_import_adyen/odoo/addons/account_statement_import_adyen @@ -0,0 +1 @@ +../../../../account_statement_import_adyen \ No newline at end of file diff --git a/setup/account_bank_statement_import_adyen/setup.py b/setup/account_statement_import_adyen/setup.py similarity index 100% rename from setup/account_bank_statement_import_adyen/setup.py rename to setup/account_statement_import_adyen/setup.py