From f637f44ebafeba32407d8d525400ba4ebce0d9af Mon Sep 17 00:00:00 2001 From: Ronald Portier Date: Wed, 17 Feb 2021 18:08:42 +0100 Subject: [PATCH] [ADD] account_bank_statement_import_online_adyen --- .../models/account_bank_statement_import.py | 29 +- .../tests/test_import_adyen.py | 7 +- .../README.rst | 118 +++++ .../__init__.py | 3 + .../__manifest__.py | 16 + .../models/__init__.py | 4 + .../models/account_journal.py | 30 ++ .../models/online_bank_statement_provider.py | 100 ++++ .../readme/CONFIGURE.rst | 27 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + .../readme/USAGE.rst | 10 + .../static/description/icon.png | Bin 0 -> 11070 bytes .../static/description/index.html | 464 ++++++++++++++++++ .../tests/__init__.py | 2 + .../online_bank_statement_provider_dummy.py | 23 + .../tests/test_import_online.py | 66 +++ .../views/online_bank_statement_provider.xml | 28 ++ 18 files changed, 917 insertions(+), 12 deletions(-) create mode 100644 account_bank_statement_import_online_adyen/README.rst create mode 100644 account_bank_statement_import_online_adyen/__init__.py create mode 100644 account_bank_statement_import_online_adyen/__manifest__.py create mode 100644 account_bank_statement_import_online_adyen/models/__init__.py create mode 100644 account_bank_statement_import_online_adyen/models/account_journal.py create mode 100644 account_bank_statement_import_online_adyen/models/online_bank_statement_provider.py create mode 100644 account_bank_statement_import_online_adyen/readme/CONFIGURE.rst create mode 100644 account_bank_statement_import_online_adyen/readme/CONTRIBUTORS.rst create mode 100644 account_bank_statement_import_online_adyen/readme/DESCRIPTION.rst create mode 100644 account_bank_statement_import_online_adyen/readme/USAGE.rst create mode 100644 account_bank_statement_import_online_adyen/static/description/icon.png create mode 100644 account_bank_statement_import_online_adyen/static/description/index.html create mode 100644 account_bank_statement_import_online_adyen/tests/__init__.py create mode 100644 account_bank_statement_import_online_adyen/tests/online_bank_statement_provider_dummy.py create mode 100644 account_bank_statement_import_online_adyen/tests/test_import_online.py create mode 100644 account_bank_statement_import_online_adyen/views/online_bank_statement_provider.xml diff --git a/account_bank_statement_import_adyen/models/account_bank_statement_import.py b/account_bank_statement_import_adyen/models/account_bank_statement_import.py index 0ba9b7ba..4df68c57 100644 --- a/account_bank_statement_import_adyen/models/account_bank_statement_import.py +++ b/account_bank_statement_import_adyen/models/account_bank_statement_import.py @@ -16,8 +16,18 @@ class AccountBankStatementImport(models.TransientModel): def _parse_file(self, data_file): """Parse an Adyen xlsx file and map merchant account strings to journals.""" try: - return self.import_adyen_xlsx(data_file) + try: + return self._parse_adyen_file(data_file) + except Exception as exc: + if self.env.context.get("account_bank_statement_import_adyen", False): + raise + _logger.info("Adyen parser error", exc_info=True) + raise ValueError("Not an adyen settlements file: %s" % exc) except ValueError: + _logger.debug( + _("Statement file was not a Adyen settlement details file."), + exc_info=True, + ) return super()._parse_file(data_file) def _find_additional_data(self, currency_code, account_number): @@ -40,25 +50,25 @@ class AccountBankStatementImport(models.TransientModel): return super()._find_additional_data(currency_code, account_number) @api.model - def balance(self, row): + def _balance(self, row): return -(float(row[15]) if row[15] else 0.0) + sum( float(row[i]) if row[i] else 0.0 for i in (16, 17, 18, 19, 20) ) @api.model - def import_adyen_transaction(self, statement, statement_id, row): + def _import_adyen_transaction(self, statement, statement_id, row): transaction_id = str(len(statement["transactions"])).zfill(4) transaction = dict( unique_import_id=statement_id + transaction_id, date=fields.Date.from_string(row[6]), - amount=self.balance(row), + amount=self._balance(row), note="{} {} {} {}".format(row[2], row[3], row[4], row[21]), name="%s" % (row[3] or row[4] or row[9]), ) statement["transactions"].append(transaction) @api.model - def parse_adyen_file(self, data_file): + def _parse_adyen_file(self, data_file): statements = [] statement = None headers = False @@ -70,6 +80,9 @@ class AccountBankStatementImport(models.TransientModel): import_model = self.env["base_import.import"] importer = import_model.create( {"file": data_file, "file_name": "Ayden settlemnt details"} + import_model = self.env["base_import.import"] + importer = import_model.create( + {"file": data_file, "file_name": "Ayden settlement details"} ) rows = importer._read_file({}) @@ -105,10 +118,10 @@ class AccountBankStatementImport(models.TransientModel): row[8] = row[8].strip() if row[8] == "MerchantPayout": - payout -= self.balance(row) + payout -= self._balance(row) else: - balance += self.balance(row) - self.import_adyen_transaction(statement, statement_id, row) + balance += self._balance(row) + self._import_adyen_transaction(statement, statement_id, row) fees += sum(float(row[i]) if row[i] else 0.0 for i in (17, 18, 19, 20)) if not headers: diff --git a/account_bank_statement_import_adyen/tests/test_import_adyen.py b/account_bank_statement_import_adyen/tests/test_import_adyen.py index 1fc5418f..ca75591a 100644 --- a/account_bank_statement_import_adyen/tests/test_import_adyen.py +++ b/account_bank_statement_import_adyen/tests/test_import_adyen.py @@ -23,9 +23,6 @@ class TestImportAdyen(SavepointCase): "currency_id": cls.env.ref("base.USD").id, } ) - # Enable reconcilation on the default journal account to trigger - # the functionality from account_bank_statement_clearing_account - cls.journal.default_debit_account_id.reconcile = True def test_01_import_adyen(self): """ Test that the Adyen statement can be imported and that the @@ -68,7 +65,9 @@ class TestImportAdyen(SavepointCase): import_wizard = self.env["account.bank.statement.import"].create( {"attachment_ids": [(0, 0, {"name": "test file", "datas": data_file})]} ) - import_wizard.import_file() + import_wizard.with_context( + {"account_bank_statement_import_adyen": True} + ).import_file() # statement name is account number + '-' + date of last line: statements = self.env["account.bank.statement"].search( [("name", "=", statement_name)] diff --git a/account_bank_statement_import_online_adyen/README.rst b/account_bank_statement_import_online_adyen/README.rst new file mode 100644 index 00000000..32b36ef1 --- /dev/null +++ b/account_bank_statement_import_online_adyen/README.rst @@ -0,0 +1,118 @@ +============================================ +Online Bank Statements: Adyen payment report +============================================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fbank--statement--import-lightgray.png?logo=github + :target: https://github.com/OCA/bank-statement-import/tree/13.0/account_bank_statement_import_online_adyen + :alt: OCA/bank-statement-import +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/bank-statement-import-13-0/bank-statement-import-13-0-account_bank_statement_import_online_adyen + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/174/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module automates the download and import of Adyen payment reports. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +To configure online bank statements provider: + +#. Go to *Invoicing > Configuration > Bank Accounts* +#. Open bank account to configure and edit it +#. Set *Bank Feeds* to *Online* +#. Select *Adyen* as online bank statements provider in + *Online Bank Statements (OCA)* section +#. Save the bank account +#. Click on provider and configure provider-specific settings. + +or, alternatively: + +#. Go to *Invoicing > Overview* +#. Open settings of the corresponding journal account +#. Switch to *Bank Account* tab +#. Set *Bank Feeds* to *Online* +#. Select *Adyen* as online bank statements provider in + *Online Bank Statements (OCA)* section +#. Save the bank account +#. Click on provider and configure provider-specific settings. + +To obtain *Login* and *Key*: + +#. Open `Adyen website `_. + +Check also ``account_bank_statement_import_online`` configuration instructions +for more information. + +Usage +===== + +To pull historical bank statements: + +#. Go to *Invoicing > Configuration > Bank Accounts* +#. Select specific bank accounts +#. Launch *Actions > Online Bank Statements Pull Wizard* +#. Configure date interval and click *Pull* + +If historical data is not needed, then just simply wait for the scheduled +activity "Pull Online Bank Statements" to be executed for getting new +transactions. + +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 +~~~~~~~ + +* Ronald Portier (Therp BV) + +Contributors +~~~~~~~~~~~~ + +* Ronald Portier - Therp BV + +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/bank-statement-import `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_bank_statement_import_online_adyen/__init__.py b/account_bank_statement_import_online_adyen/__init__.py new file mode 100644 index 00000000..ad8c8648 --- /dev/null +++ b/account_bank_statement_import_online_adyen/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from . import models +from .tests import online_bank_statement_provider_dummy diff --git a/account_bank_statement_import_online_adyen/__manifest__.py b/account_bank_statement_import_online_adyen/__manifest__.py new file mode 100644 index 00000000..52ae345b --- /dev/null +++ b/account_bank_statement_import_online_adyen/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2021 - Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Online Bank Statements: Adyen payment report", + "version": "13.0.1.0.0", + "category": "Account", + "website": "https://github.com/OCA/bank-statement-import", + "author": "Ronald Portier (Therp BV), Odoo Community Association (OCA)", + "license": "AGPL-3", + "installable": True, + "depends": [ + "account_bank_statement_import_adyen", + "account_bank_statement_import_online", + ], + "data": ["views/online_bank_statement_provider.xml"], +} diff --git a/account_bank_statement_import_online_adyen/models/__init__.py b/account_bank_statement_import_online_adyen/models/__init__.py new file mode 100644 index 00000000..56bd827c --- /dev/null +++ b/account_bank_statement_import_online_adyen/models/__init__.py @@ -0,0 +1,4 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import account_journal +from . import online_bank_statement_provider diff --git a/account_bank_statement_import_online_adyen/models/account_journal.py b/account_bank_statement_import_online_adyen/models/account_journal.py new file mode 100644 index 00000000..fb7572a3 --- /dev/null +++ b/account_bank_statement_import_online_adyen/models/account_journal.py @@ -0,0 +1,30 @@ +# Copyright 2021 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +from odoo import api, models + + +class AccountJournal(models.Model): + _inherit = "account.journal" + + def write(self, vals): + """Do not reset a provider to file_import, if that will delete provider.""" + # TODO: In the future place this in super account_bank_statement_import_online. + for this in self: + is_online = this.bank_statements_source == "online" + if is_online and vals.get("bank_statements_source", "online") != "online": + vals.pop("bank_statements_source") + super(AccountJournal, this).write(vals) + return True + + @api.model + def _selection_online_bank_statement_provider(self): + res = super()._selection_online_bank_statement_provider() + res.append(("dummy_adyen", "Dummy Adyen")) + return res + + @api.model + def values_online_bank_statement_provider(self): + res = super().values_online_bank_statement_provider() + if self.user_has_groups("base.group_no_one"): + res += [("dummy_adyen", "Dummy Adyen")] + return res diff --git a/account_bank_statement_import_online_adyen/models/online_bank_statement_provider.py b/account_bank_statement_import_online_adyen/models/online_bank_statement_provider.py new file mode 100644 index 00000000..62a9babd --- /dev/null +++ b/account_bank_statement_import_online_adyen/models/online_bank_statement_provider.py @@ -0,0 +1,100 @@ +# Copyright 2021 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +import logging +from html import escape + +import requests + +from odoo import _, api, fields, models +from odoo.exceptions import UserError + +_logger = logging.getLogger(__name__) + + +class OnlineBankStatementProvider(models.Model): + _inherit = "online.bank.statement.provider" + + download_file_name = fields.Char() + next_batch_number = fields.Integer() + + @api.model + def _selection_service(self): + res = super()._selection_service() + res.append(("dummy_adyen", "Dummy Adyen")) + return res + + @api.model + def _get_available_services(self): + return super()._get_available_services() + [("adyen", "Adyen payment report")] + + def _pull(self, date_since, date_until): # noqa: C901 + """Split between adyen providers and others.""" + adyen_providers = self.filtered(lambda r: r.service in ("adyen", "dummy_adyen")) + other_providers = self.filtered( + lambda r: r.service not in ("adyen", "dummy_adyen") + ) + if other_providers: + super(OnlineBankStatementProvider, other_providers)._pull( + date_since, date_until + ) + for provider in adyen_providers: + # TODO: incrementing batch number + is_scheduled = self.env.context.get("scheduled") + try: + data_file = self._adyen_get_settlement_details_file() + import_wizard = self.env["account.bank.statement.import"].create( + { + "attachment_ids": [ + (0, 0, {"name": "test file", "datas": data_file}) + ] + } + ) + import_wizard.with_context( + {"account_bank_statement_import_adyen": True} + ).import_file() + except BaseException as e: + if is_scheduled: + _logger.warning( + 'Online Bank Statement Provider "%s" failed to' + " obtain statement data" % (provider.name,), + exc_info=True, + ) + provider.message_post( + body=_( + "Failed to obtain statement data for period " + ": %s. See server logs for more details." + ) + % (escape(str(e)) or _("N/A"),), + subject=_("Issue with Online Bank Statement Provider"), + ) + break + raise + if is_scheduled: + provider._schedule_next_run() + + def _adyen_get_settlement_details_file(self): + """Retrieve daily generated settlement details file. + + The file could be retrieved with wget using: + $ wget \ + --http-user='[YourReportUser]@Company.[YourCompanyAccount]' \ + --http-password='[YourReportUserPassword]' \ + --quiet --no-check-certificate \ + https://ca-test.adyen.com/reports/download/MerchantAccount/ + + [YourMerchantAccount]/[ReportFileName]" + """ + batch_number = self.next_batch_number + download_file_name = self.download_file_name % batch_number + URL = "/".join( + [self.api_base, self.journal_id.adyen_merchant_account, download_file_name] + ) + response = requests.get(URL, auth=(self.username, self.password)) + if response.status_code == 200: + return response.content + else: + raise UserError(_("%s \n\n %s") % (response.status_code, response.text)) + + def _schedule_next_run(self): + """Set next run date and autoincrement batch number.""" + super()._schedule_next_run() + self.next_batch_number += 1 diff --git a/account_bank_statement_import_online_adyen/readme/CONFIGURE.rst b/account_bank_statement_import_online_adyen/readme/CONFIGURE.rst new file mode 100644 index 00000000..da06dd2c --- /dev/null +++ b/account_bank_statement_import_online_adyen/readme/CONFIGURE.rst @@ -0,0 +1,27 @@ +To configure online bank statements provider: + +#. Go to *Invoicing > Configuration > Bank Accounts* +#. Open bank account to configure and edit it +#. Set *Bank Feeds* to *Online* +#. Select *Adyen* as online bank statements provider in + *Online Bank Statements (OCA)* section +#. Save the bank account +#. Click on provider and configure provider-specific settings. + +or, alternatively: + +#. Go to *Invoicing > Overview* +#. Open settings of the corresponding journal account +#. Switch to *Bank Account* tab +#. Set *Bank Feeds* to *Online* +#. Select *Adyen* as online bank statements provider in + *Online Bank Statements (OCA)* section +#. Save the bank account +#. Click on provider and configure provider-specific settings. + +To obtain *Login* and *Key*: + +#. Open `Adyen website `_. + +Check also ``account_bank_statement_import_online`` configuration instructions +for more information. diff --git a/account_bank_statement_import_online_adyen/readme/CONTRIBUTORS.rst b/account_bank_statement_import_online_adyen/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..6ee4d1d6 --- /dev/null +++ b/account_bank_statement_import_online_adyen/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Ronald Portier - Therp BV diff --git a/account_bank_statement_import_online_adyen/readme/DESCRIPTION.rst b/account_bank_statement_import_online_adyen/readme/DESCRIPTION.rst new file mode 100644 index 00000000..fc01c0c4 --- /dev/null +++ b/account_bank_statement_import_online_adyen/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module automates the download and import of Adyen payment reports. diff --git a/account_bank_statement_import_online_adyen/readme/USAGE.rst b/account_bank_statement_import_online_adyen/readme/USAGE.rst new file mode 100644 index 00000000..2785a201 --- /dev/null +++ b/account_bank_statement_import_online_adyen/readme/USAGE.rst @@ -0,0 +1,10 @@ +To pull historical bank statements: + +#. Go to *Invoicing > Configuration > Bank Accounts* +#. Select specific bank accounts +#. Launch *Actions > Online Bank Statements Pull Wizard* +#. Configure date interval and click *Pull* + +If historical data is not needed, then just simply wait for the scheduled +activity "Pull Online Bank Statements" to be executed for getting new +transactions. diff --git a/account_bank_statement_import_online_adyen/static/description/icon.png b/account_bank_statement_import_online_adyen/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..09847ed7696bcad441aac277011add9a9a82c01d GIT binary patch literal 11070 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 literal 0 HcmV?d00001 diff --git a/account_bank_statement_import_online_adyen/static/description/index.html b/account_bank_statement_import_online_adyen/static/description/index.html new file mode 100644 index 00000000..beccd682 --- /dev/null +++ b/account_bank_statement_import_online_adyen/static/description/index.html @@ -0,0 +1,464 @@ + + + + + + +Online Bank Statements: Adyen payment report + + + +
+

Online Bank Statements: Adyen payment report

+ + +

Beta License: AGPL-3 OCA/bank-statement-import Translate me on Weblate Try me on Runbot

+

This module automates the download and import of Adyen payment reports.

+

Table of contents

+ +
+

Configuration

+

To configure online bank statements provider:

+
    +
  1. Go to Invoicing > Configuration > Bank Accounts
    2. +
  2. Open bank account to configure and edit it
    3. +
  3. Set Bank Feeds to Online
    4. +
  4. Select Adyen as online bank statements provider in +Online Bank Statements (OCA) section
    5. +
  5. Save the bank account
    6. +
  6. Click on provider and configure provider-specific settings.
    7. +
+

or, alternatively:

+
    +
  1. Go to Invoicing > Overview
    2. +
  2. Open settings of the corresponding journal account
    3. +
  3. Switch to Bank Account tab
    4. +
  4. Set Bank Feeds to Online
    5. +
  5. Select Adyen as online bank statements provider in +Online Bank Statements (OCA) section
    6. +
  6. Save the bank account
    7. +
  7. Click on provider and configure provider-specific settings.
    8. +
+

To obtain Login and Key:

+
    +
  1. Open Adyen website.
    2. +
+

Check also account_bank_statement_import_online configuration instructions +for more information.

+
+
+

Usage

+

To pull historical bank statements:

+
    +
  1. Go to Invoicing > Configuration > Bank Accounts
    2. +
  2. Select specific bank accounts
    3. +
  3. Launch Actions > Online Bank Statements Pull Wizard
    4. +
  4. Configure date interval and click Pull
    5. +
+

If historical data is not needed, then just simply wait for the scheduled +activity “Pull Online Bank Statements” to be executed for getting new +transactions.

+
+
+

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

+
    +
  • Ronald Portier (Therp BV)
    • +
+
+
+

Contributors

+
    +
  • Ronald Portier - Therp BV
    • +
+
+
+

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/bank-statement-import project on GitHub.

+

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

+
+
+
+ + diff --git a/account_bank_statement_import_online_adyen/tests/__init__.py b/account_bank_statement_import_online_adyen/tests/__init__.py new file mode 100644 index 00000000..e889bae2 --- /dev/null +++ b/account_bank_statement_import_online_adyen/tests/__init__.py @@ -0,0 +1,2 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from . import test_import_online diff --git a/account_bank_statement_import_online_adyen/tests/online_bank_statement_provider_dummy.py b/account_bank_statement_import_online_adyen/tests/online_bank_statement_provider_dummy.py new file mode 100644 index 00000000..9c42c0aa --- /dev/null +++ b/account_bank_statement_import_online_adyen/tests/online_bank_statement_provider_dummy.py @@ -0,0 +1,23 @@ +# Copyright 2021 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +import base64 + +from odoo import models +from odoo.modules.module import get_module_resource + + +class OnlineBankStatementProviderDummy(models.Model): + _inherit = "online.bank.statement.provider" + + def _adyen_get_settlement_details_file(self): + """Get file from disk, instead of from url.""" + if self.service != "dummy_adyen": + # Not a dummy, get the regular adyen method. + return super()._adyen_get_settlement_details_file() + testfile = get_module_resource( + "account_bank_statement_import_adyen", "test_files", self.download_file_name + ) + with open(testfile, "rb") as datafile: + data_file = datafile.read() + data_file = base64.b64encode(data_file) + return data_file diff --git a/account_bank_statement_import_online_adyen/tests/test_import_online.py b/account_bank_statement_import_online_adyen/tests/test_import_online.py new file mode 100644 index 00000000..71c0d765 --- /dev/null +++ b/account_bank_statement_import_online_adyen/tests/test_import_online.py @@ -0,0 +1,66 @@ +# Copyright 2021 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from dateutil.relativedelta import relativedelta + +from odoo import fields + +from odoo.addons.account_bank_statement_import_adyen.tests.test_import_adyen import ( + TestImportAdyen, +) + + +class TestImportOnline(TestImportAdyen): + """Do the same tests as with the offline adyen import.""" + + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.now = fields.Datetime.now() + cls.journal.write( + { + "bank_statements_source": "online", + "online_bank_statement_provider": "dummy_adyen", + } + ) + + def test_03_import_adyen_invalid(self): + """Override super test: online module test will return without statements.""" + with self.assertRaisesRegex(AssertionError, "account.bank.statement()"): + self._test_statement_import( + "adyen_test_invalid.xls", "invalid", + ) + + def _test_statement_import(self, file_name, statement_name): + """Test correct creation of single statement. + + Getting an adyen statement online should result in: + 1. A valid imported statement; + 2. An incremented batch number; + 3. The current date being set as the date_since in the provider. + """ + provider = self.journal.online_bank_statement_provider_id + provider.write( + { + "api_base": ( + "https://ca-test.adyen.com/reports/download/MerchantAccount" + ), + "download_file_name": file_name, + "interval_type": "days", + "interval_number": 1, + "service": "dummy_adyen", + "next_batch_number": 1, + } + ) + # Pull from yesterday, until today + yesterday = self.now - relativedelta(days=1) + provider.with_context(scheduled=True)._pull(yesterday, self.now) + # statement name is account number + '-' + date of last line: + statements = self.env["account.bank.statement"].search( + [("name", "=", statement_name)] + ) + self.assertTrue(statements) + self.assertEqual(len(statements), 1) + self.assertEqual(provider.next_batch_number, 2) + self.assertEqual(provider.last_successful_run, self.now) + self.assertTrue(provider.next_run > self.now) + return statements diff --git a/account_bank_statement_import_online_adyen/views/online_bank_statement_provider.xml b/account_bank_statement_import_online_adyen/views/online_bank_statement_provider.xml new file mode 100644 index 00000000..294c7769 --- /dev/null +++ b/account_bank_statement_import_online_adyen/views/online_bank_statement_provider.xml @@ -0,0 +1,28 @@ + + + + online.bank.statement.provider.form + online.bank.statement.provider + + + + + + + + + + + + + +