diff --git a/account_bank_statement_clearing_account/README.rst b/account_bank_statement_clearing_account/README.rst new file mode 100644 index 00000000..830495f8 --- /dev/null +++ b/account_bank_statement_clearing_account/README.rst @@ -0,0 +1,110 @@ +============================================= +Reconcile entries from pseudo bank statements +============================================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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_clearing_account + :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_clearing_account + :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 is a technical modules that you can use to improve the processing of +statement files from payment providers. These statements usually consist +of lines that to be reconciled by customer debts, offset by lines that are +to be reconciled by the imbursements from the payment provider, corrected +for customer credits and the costs of the payment provider. Typically, the +balance of such a statement is zero. Effectively, the counterpart of each +statement line is made on a clearing account and you should keep track of +the balance of the clearing account to see if the payment provider still owes +you money. You can keep track of the account by reconciling each entry on it. + +That is where this module comes in. When importing such a statement, this +module reconciles all the counterparts on the clearing account with one +another. Reconciliation is executed when validating the statement. When +reopening the statement, the reconcilation is undone. + +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` + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +In order to enable the reconcilation of the counterparts of zero-balance +statement files from payment providers, you need to make sure that the journal +that is used for these statements have the same default debit account as their +default credit account, and this account is configured for reconciliation. + +Usage +===== + +After installing this module, any statement where the sum of all debit and +credit lines match, and where the default journal account is reconcilable, will +reconcile all posted moved when the statement is confirmed. + +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 +~~~~~~~ + +* Opener B.V. +* Vanmoof BV + +Contributors +~~~~~~~~~~~~ + +* Stefan Rijnhart (https://opener.amsterdam) +* Martin Pishpecki (https://www.vanmoof.com) +* Ronald Portier (https://therp.nl) + +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_clearing_account/__init__.py b/account_bank_statement_clearing_account/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/account_bank_statement_clearing_account/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_bank_statement_clearing_account/__manifest__.py b/account_bank_statement_clearing_account/__manifest__.py new file mode 100644 index 00000000..d5269800 --- /dev/null +++ b/account_bank_statement_clearing_account/__manifest__.py @@ -0,0 +1,13 @@ +# Copyright 2017 Opener BV () +# Copyright 2020 Vanmoof 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)", + "category": "Banking addons", + "website": "https://github.com/OCA/bank-statement-import", + "license": "AGPL-3", + "depends": ["account"], + "installable": True, +} diff --git a/account_bank_statement_clearing_account/models/__init__.py b/account_bank_statement_clearing_account/models/__init__.py new file mode 100644 index 00000000..0882dd26 --- /dev/null +++ b/account_bank_statement_clearing_account/models/__init__.py @@ -0,0 +1 @@ +from . import account_bank_statement diff --git a/account_bank_statement_clearing_account/models/account_bank_statement.py b/account_bank_statement_clearing_account/models/account_bank_statement.py new file mode 100644 index 00000000..79baf5dc --- /dev/null +++ b/account_bank_statement_clearing_account/models/account_bank_statement.py @@ -0,0 +1,86 @@ +# Copyright 2017 Opener BV () +# Copyright 2020 Vanmoof BV () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +from odoo import models + + +class BankStatement(models.Model): + _inherit = "account.bank.statement" + + def get_reconcile_clearing_account_lines(self): + """ If this statement qualifies for clearing account reconciliation, + return the relevant lines to (un)reconcile. This is the case if the + default journal account is reconcilable, each statement line has a + counterpart line on this account for the full amount and the sum of + the counterpart lines is zero. + """ + self.ensure_one() + if ( + self.journal_id.default_debit_account_id + != self.journal_id.default_credit_account_id + or not self.journal_id.default_debit_account_id.reconcile + ): + return False + account = self.journal_id.default_debit_account_id + currency = self.journal_id.currency_id or self.company_id.currency_id + + def get_bank_line(st_line): + for line in st_line.journal_entry_ids: + field = "debit" if st_line.amount > 0 else "credit" + if line.account_id == account and not currency.compare_amounts( + line[field], abs(st_line.amount) + ): + return line + return False + + move_lines = self.env["account.move.line"] + for st_line in self.line_ids: + bank_line = get_bank_line(st_line) + if not bank_line: + return False + move_lines += bank_line + balance = sum(line.debit - line.credit for line in move_lines) + if not currency.is_zero(balance): + return False + return move_lines + + def reconcile_clearing_account(self): + """ If applicable, reconcile the clearing account lines in case + all lines are still unreconciled. """ + self.ensure_one() + lines = self.get_reconcile_clearing_account_lines() + if not lines or any( + li.matched_debit_ids or li.matched_credit_ids for li in lines + ): + return False + lines.reconcile() + return True + + def unreconcile_clearing_account(self): + """ If applicable, unreconcile the clearing account lines + if still fully reconciled with each other. """ + self.ensure_one() + lines = self.get_reconcile_clearing_account_lines() + if not lines: + return False + reconciliation = lines[0].full_reconcile_id + if reconciliation and lines == reconciliation.reconciled_line_ids: + lines.remove_move_reconcile() + return True + return False + + def button_reopen(self): + """ When setting the statement back to draft, unreconcile the + reconciliation on the clearing account """ + res = super(BankStatement, self).button_reopen() + for statement in self: + statement.unreconcile_clearing_account() + return res + + 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() + for statement in self: + statement.reconcile_clearing_account() + return res diff --git a/account_bank_statement_clearing_account/readme/CONFIGURE.rst b/account_bank_statement_clearing_account/readme/CONFIGURE.rst new file mode 100644 index 00000000..b29c2ce6 --- /dev/null +++ b/account_bank_statement_clearing_account/readme/CONFIGURE.rst @@ -0,0 +1,4 @@ +In order to enable the reconcilation of the counterparts of zero-balance +statement files from payment providers, you need to make sure that the journal +that is used for these statements have the same default debit account as their +default credit account, and this account is configured for reconciliation. diff --git a/account_bank_statement_clearing_account/readme/CONTRIBUTORS.rst b/account_bank_statement_clearing_account/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..f00439e5 --- /dev/null +++ b/account_bank_statement_clearing_account/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Stefan Rijnhart (https://opener.amsterdam) +* Martin Pishpecki (https://www.vanmoof.com) +* Ronald Portier (https://therp.nl) diff --git a/account_bank_statement_clearing_account/readme/DESCRIPTION.rst b/account_bank_statement_clearing_account/readme/DESCRIPTION.rst new file mode 100644 index 00000000..7043715f --- /dev/null +++ b/account_bank_statement_clearing_account/readme/DESCRIPTION.rst @@ -0,0 +1,20 @@ +This is a technical modules that you can use to improve the processing of +statement files from payment providers. These statements usually consist +of lines that to be reconciled by customer debts, offset by lines that are +to be reconciled by the imbursements from the payment provider, corrected +for customer credits and the costs of the payment provider. Typically, the +balance of such a statement is zero. Effectively, the counterpart of each +statement line is made on a clearing account and you should keep track of +the balance of the clearing account to see if the payment provider still owes +you money. You can keep track of the account by reconciling each entry on it. + +That is where this module comes in. When importing such a statement, this +module reconciles all the counterparts on the clearing account with one +another. Reconciliation is executed when validating the statement. When +reopening the statement, the reconcilation is undone. + +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` diff --git a/account_bank_statement_clearing_account/readme/USAGE.rst b/account_bank_statement_clearing_account/readme/USAGE.rst new file mode 100644 index 00000000..9f9ef0ac --- /dev/null +++ b/account_bank_statement_clearing_account/readme/USAGE.rst @@ -0,0 +1,3 @@ +After installing this module, any statement where the sum of all debit and +credit lines match, and where the default journal account is reconcilable, will +reconcile all posted moved when the statement is confirmed. diff --git a/account_bank_statement_clearing_account/static/description/index.html b/account_bank_statement_clearing_account/static/description/index.html new file mode 100644 index 00000000..ba3839a4 --- /dev/null +++ b/account_bank_statement_clearing_account/static/description/index.html @@ -0,0 +1,442 @@ + + + + + + +Reconcile entries from pseudo bank statements + + + +
+

Reconcile entries from pseudo bank statements

+ + +

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

+

This is a technical modules that you can use to improve the processing of +statement files from payment providers. These statements usually consist +of lines that to be reconciled by customer debts, offset by lines that are +to be reconciled by the imbursements from the payment provider, corrected +for customer credits and the costs of the payment provider. Typically, the +balance of such a statement is zero. Effectively, the counterpart of each +statement line is made on a clearing account and you should keep track of +the balance of the clearing account to see if the payment provider still owes +you money. You can keep track of the account by reconciling each entry on it.

+

That is where this module comes in. When importing such a statement, this +module reconciles all the counterparts on the clearing account with one +another. Reconciliation is executed when validating the statement. When +reopening the statement, the reconcilation is undone.

+
+

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

+

Table of contents

+
+
+

Configuration

+

In order to enable the reconcilation of the counterparts of zero-balance +statement files from payment providers, you need to make sure that the journal +that is used for these statements have the same default debit account as their +default credit account, and this account is configured for reconciliation.

+
+
+

Usage

+

After installing this module, any statement where the sum of all debit and +credit lines match, and where the default journal account is reconcilable, will +reconcile all posted moved when the statement is confirmed.

+
+
+

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

+
    +
  • Opener B.V.
  • +
  • Vanmoof BV
  • +
+
+
+

Contributors

+ +
+
+

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_clearing_account/tests/__init__.py b/account_bank_statement_clearing_account/tests/__init__.py new file mode 100644 index 00000000..3e17ae02 --- /dev/null +++ b/account_bank_statement_clearing_account/tests/__init__.py @@ -0,0 +1 @@ +from . import test_clearing_account diff --git a/account_bank_statement_clearing_account/tests/test_clearing_account.py b/account_bank_statement_clearing_account/tests/test_clearing_account.py new file mode 100644 index 00000000..e698da0a --- /dev/null +++ b/account_bank_statement_clearing_account/tests/test_clearing_account.py @@ -0,0 +1,120 @@ +# Copyright 2017 Opener BV +# Copyright 2020 Vanmoof BV +# Copyright 2015-2021 Therp BV ) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +from odoo.tests.common import SavepointCase + + +class TestClearingAccount(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.journal = cls.env["account.journal"].create( + { + "company_id": cls.env.user.company_id.id, + "name": "Clearing account test", + "code": "CAT", + "type": "bank", + "currency_id": cls.env.ref("base.USD").id, + } + ) + cls.partner_customer = cls.env["res.partner"].create({"name": "cutomer"}) + 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 + cls.journal.default_debit_account_id.reconcile = True + + def test_reconcile_unreconcile(self): + """Test that a bank statement that satiesfies the conditions, cab be + automatically reconciled and unreconciled on confirmation or reset of the + statement. + """ + account = self.journal.default_debit_account_id + statement = self.env["account.bank.statement"].create( + { + "name": "Test autoreconcile 2021-03-08", + "reference": "AUTO-2021-08-03", + "date": "2021-03-08", + "state": "open", + "journal_id": self.journal.id, + "line_ids": [ + ( + 0, + 0, + { + "name": "web sale", + "partner_id": self.partner_customer.id, + "amount": 100.00, + "account_id": account.id, + }, + ), + ( + 0, + 0, + { + "name": "transaction_fees", + "partner_id": False, + "amount": -1.25, + "account_id": account.id, + }, + ), + ( + 0, + 0, + { + "name": "due_from_provider", + "partner_id": self.partner_provider.id, + "amount": -98.75, + "account_id": account.id, + }, + ), + ], + } + ) + self.assertEqual(statement.journal_id, self.journal) + self.assertEqual(len(statement.line_ids), 3) + self.assertTrue( + self.env.user.company_id.currency_id.is_zero( + sum(line.amount for line in statement.line_ids) + ) + ) + account = self.env["account.account"].search( + [("internal_type", "=", "receivable")], limit=1 + ) + for line in statement.line_ids: + line.process_reconciliation( + new_aml_dicts=[ + { + "debit": -line.amount if line.amount < 0 else 0, + "credit": line.amount if line.amount > 0 else 0, + "account_id": account.id, + } + ] + ) + statement.button_confirm_bank() + self.assertEqual(statement.state, "confirm") + lines = self.env["account.move.line"].search( + [ + ("account_id", "=", self.journal.default_debit_account_id.id), + ("statement_id", "=", statement.id), + ] + ) + reconcile = lines.mapped("full_reconcile_id") + self.assertEqual(len(reconcile), 1) + self.assertEqual(lines, reconcile.reconciled_line_ids) + + # Reset the bank statement to see the counterpart lines being + # unreconciled + statement.button_reopen() + self.assertEqual(statement.state, "open") + self.assertFalse(lines.mapped("matched_debit_ids")) + self.assertFalse(lines.mapped("matched_credit_ids")) + self.assertFalse(lines.mapped("full_reconcile_id")) + + # Confirm the statement without the correct clearing account settings + self.journal.default_debit_account_id.reconcile = False + statement.button_confirm_bank() + self.assertEqual(statement.state, "confirm") + self.assertFalse(lines.mapped("matched_debit_ids")) + self.assertFalse(lines.mapped("matched_credit_ids")) + self.assertFalse(lines.mapped("full_reconcile_id")) diff --git a/account_bank_statement_import_adyen/README.rst b/account_bank_statement_import_adyen/README.rst new file mode 100644 index 00000000..5a8d54c1 --- /dev/null +++ b/account_bank_statement_import_adyen/README.rst @@ -0,0 +1,97 @@ +====================== +Adyen statement import +====================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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_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_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 processes Adyen transaction statements, the settlement details report, +in excel or csv format. + +You can import the statements in a dedicated journal. Reconcile your sale invoices +with the credit transations. Reconcile the aggregated counterpart +transaction with the transaction in your real bank journal and register the +aggregated fee line containing commision and markup on the applicable +cost account. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +Configure a pseudo bank journal by creating a new journal linked to your Adyen +merchant account. Set your merchant account string in the Advanced settings +on the journal form. + +Usage +===== + +After installing this module, you can import your Adyen transaction statements +through Menu Finance -> Bank -> Import. Don't enter a journal in the import +wizard. + +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 +~~~~~~~ + +* Opener BV +* Vanmoof BV + +Contributors +~~~~~~~~~~~~ + +* Stefan Rijnhart (https://opener.amsterdam) +* Martin Pishpecki (https://www.vanmoof.com) +* Ronald Portier (https://therp.nl) + +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_adyen/__init__.py b/account_bank_statement_import_adyen/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/account_bank_statement_import_adyen/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_bank_statement_import_adyen/__manifest__.py b/account_bank_statement_import_adyen/__manifest__.py new file mode 100644 index 00000000..91064694 --- /dev/null +++ b/account_bank_statement_import_adyen/__manifest__.py @@ -0,0 +1,19 @@ +# Copyright 2017 Opener BV +# Copyright 2020 Vanmoof BV +# Copyright 2021 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +{ + "name": "Adyen statement import", + "version": "13.0.1.0.0", + "author": "Opener BV, Vanmoof BV, Odoo Community Association (OCA)", + "category": "Banking addons", + "website": "https://github.com/OCA/bank-statement-import", + "license": "AGPL-3", + "depends": [ + "base_import", + "account_bank_statement_import", + "account_bank_statement_clearing_account", + ], + "data": ["views/account_journal.xml"], + "installable": True, +} diff --git a/account_bank_statement_import_adyen/models/__init__.py b/account_bank_statement_import_adyen/models/__init__.py new file mode 100644 index 00000000..7ce2f087 --- /dev/null +++ b/account_bank_statement_import_adyen/models/__init__.py @@ -0,0 +1,3 @@ +from . import account_bank_statement_import +from . import account_bank_statement_import_adyen_parser +from . import account_journal 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 new file mode 100644 index 00000000..0e232a33 --- /dev/null +++ b/account_bank_statement_import_adyen/models/account_bank_statement_import.py @@ -0,0 +1,47 @@ +# Copyright 2017 Opener BV () +# Copyright 2021-2022 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +"""Add import of Adyen statements.""" +# pylint: disable=protected-access,no-self-use +import logging + +from odoo import _, models +from odoo.exceptions import UserError + +_logger = logging.getLogger(__name__) # pylint: disable=invalid-name + + +class AccountBankStatementImport(models.TransientModel): + """Add import of Adyen statements.""" + + _inherit = "account.bank.statement.import" + + def _parse_file(self, data_file): + """Parse an Adyen xlsx file and map merchant account strings to journals.""" + try: + return self._parse_adyen_file(data_file) + except Exception as exc: # pylint: disable=broad-except + message = _("Statement file was not a Adyen settlement details file.") + if self.env.context.get("account_bank_statement_import_adyen", False): + raise UserError(message) from exc + _logger.debug(message, exc_info=True) + return super()._parse_file(data_file) + + def _parse_adyen_file(self, data_file): + """Just parse the adyen file.""" + _logger.debug(_("Try parsing as Adyen settlement details.")) + parser = self.env["account.bank.statement.import.adyen.parser"] + rows = self._get_rows(data_file) + return parser.parse_rows(rows) + + def _get_rows(self, data_file): + """Get rows from data_file.""" + # Try to use original import file name. + filename = ( + self.attachment_ids[0].name + if len(self.attachment_ids) == 1 + else "Ayden settlement details" + ) + import_model = self.env["base_import.import"] + importer = import_model.create({"file": data_file, "file_name": filename}) + return importer._read_file({"quoting": '"', "separator": ","}) diff --git a/account_bank_statement_import_adyen/models/account_bank_statement_import_adyen_parser.py b/account_bank_statement_import_adyen/models/account_bank_statement_import_adyen_parser.py new file mode 100644 index 00000000..3186a412 --- /dev/null +++ b/account_bank_statement_import_adyen/models/account_bank_statement_import_adyen_parser.py @@ -0,0 +1,286 @@ +# Copyright 2017 Opener BV () +# Copyright 2021-2022 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +"""Add import of Adyen statements.""" +# pylint: disable=protected-access,no-self-use +import logging + +from odoo import _, fields, models +from odoo.exceptions import UserError + +_logger = logging.getLogger(__name__) # pylint: disable=invalid-name + +COLUMNS = { + "Company Account": 1, + "Merchant Account": 2, + "Psp Reference": 3, + "Merchant Reference": 4, + "Payment Method": 5, # Not used at present + "Creation Date": 6, + "TimeZone": 7, # Not used at present + "Type": 8, + "Modification Reference": 9, + "Gross Currency": 10, # Not used at present + "Gross Debit (GC)": 11, # Not used at present + "Gross Credit (GC)": 12, # Not used at present + "Exchange Rate": 13, # Not used at present + "Net Currency": 14, + "Net Debit (NC)": 15, # Fee or Merchant Payout + "Net Credit (NC)": 16, + "Commission (NC)": 17, + "Markup (NC)": 18, + "Scheme Fees (NC)": 19, + "Interchange (NC)": 20, + "Payment Method Variant": 21, + "Modification Merchant Reference": 22, # Not used at present + "Batch Number": 23, + "Reserved4": 24, # Not used at present + "Reserved5": 25, # Not used at present + "Reserved6": 26, # Not used at present + "Reserved7": 27, # Not used at present + "Reserved8": 28, # Not used at present + "Reserved9": 29, # Not used at present + "Reserved10": 30, # Not used at present +} + + +class AccountBankStatementImportAdyenParser(models.TransientModel): + """Parse Adyen statement files for bank import.""" + + _name = "account.bank.statement.import.adyen.parser" + _description = "Account Bank Statement Import Adyen Parser" + + def parse_rows(self, rows): + """Parse rows generated from an Adyen file. + + An Exception will be thrown if file cannot be parsed. + """ + statement = None + fees = 0.0 + balance = 0.0 + payout = 0.0 + num_rows = self._process_headers(rows) + for row in rows: + num_rows += 1 + if not self._is_transaction_row(row): + continue + if not statement: + statement = self._make_statement(row) + statement_info = self._get_statement_info(row) + row_type = self._get_value(row, "Type").strip() + if row_type == "MerchantPayout": + payout -= self._balance(row) + else: + balance += self._balance(row) + transaction = self._get_transaction(row) + self._append_transaction(statement, transaction) + fees += self._sum_fees(row) + if fees: + balance -= fees + self._append_fees_transaction( + statement, fees, statement_info["batch_number"] + ) + self._validate_statement(statement, payout, balance) + _logger.info( + _("Processed %d rows from Adyen statement file with %d transactions"), + num_rows, + len(statement["transactions"]), + ) + return ( + statement_info["currency_code"], + statement_info["merchant_account"], + [statement], + ) + + def _process_headers(self, rows): + """Process the headers in the generated rows.""" + num_rows = 0 + for row in rows: + num_rows += 1 + if not row[1]: + continue + on_header_row = self._check_header_row(row) + if not on_header_row: + continue + self._set_columns(row) + return num_rows + raise ValueError( + "Not an Adyen statement. Did not encounter header row in %d rows." + % (num_rows,) + ) + + def _is_transaction_row(self, row): + """Check wether row is a not empty and valid transaction row.""" + if not row[1]: + return False + if len(row) < 24: + raise ValueError( + "Not an Adyen statement. Unexpected row length %s " + "less then minimum of 24" % len(row) + ) + return True + + def _get_statement_info(self, row): + """Get general information for statement.""" + merchant_account = self._get_value(row, "Merchant Account") + self._validate_merchant_account(merchant_account) + batch_number = self._get_value(row, "Batch Number") + currency_code = self._get_value(row, "Net Currency") + return { + "merchant_account": merchant_account, + "batch_number": batch_number, + "currency_code": currency_code, + } + + def _validate_merchant_account(self, merchant_account): + """Check wether merchant account exist, and belongs to the correct journal.""" + journal = self.env["account.journal"].search( + [("adyen_merchant_account", "=", merchant_account)], limit=1 + ) + if not journal: + raise UserError( + _("No journal refers to Merchant Account %s") % merchant_account + ) + if self._context.get("journal_id", journal.id) != journal.id: + raise UserError( + _( + "Selected journal Merchant Account does not match " + "the import file Merchant Account " + "column: %s" + ) + % merchant_account + ) + + def _check_header_row(self, row): + """Header row is the first one with a "Company Account" header cell.""" + for cell in row: + if cell == "Company Account": + return True + return False + + def _set_columns(self, row): + """Set columns from headers. There MUST be a 'Company Account' header.""" + seen_company_account = False + for num, header in enumerate(row): + if not header.strip(): + continue # Ignore empty columns. + if header == "Company Account": + seen_company_account = True + if header not in COLUMNS: + _logger.debug(_("Unknown header %s in Adyen statement headers"), header) + else: + COLUMNS[header] = num # Set the right number for the column. + if not seen_company_account: + raise ValueError( + _("Not an Adyen statement. Headers %s do not contain 'Company Account'") + % ", ".join(row) + ) + + def _validate_statement(self, statement, payout, balance): + """Check wether statement valid: balanced. Log when no payout.""" + if statement["transactions"] and not payout: + _logger.info(_("No payout detected in Adyen statement.")) + if self.env.user.company_id.currency_id.compare_amounts(balance, payout) != 0: + raise UserError( + _("Parse error. Balance %s not equal to merchant " "payout %s") + % (balance, payout) + ) + + def _get_value(self, row, column): + """Get the value from the righ column in the row.""" + return row[COLUMNS[column]] + + def _make_statement(self, row): + """Make statement on first transaction in file.""" + statement = {"transactions": []} + statement["name"] = "{merchant} {year}/{batch}".format( + merchant=self._get_value(row, "Merchant Account"), + year=self._get_value(row, "Creation Date")[:4], + batch=self._get_value(row, "Batch Number"), + ) + statement["date"] = self._get_transaction_date(row) + return statement + + def _get_transaction_date(self, row): + """Get transaction date in right format.""" + return fields.Date.from_string(self._get_value(row, "Creation Date")) + + def _balance(self, row): + return ( + -self._sum_amount_values(row, ("Net Debit (NC)",)) + + self._sum_amount_values(row, ("Net Credit (NC)",)) + + self._sum_fees(row) + ) + + def _sum_fees(self, row): + """Sum the amounts in the fees columns.""" + return self._sum_amount_values( + row, + ("Commission (NC)", "Markup (NC)", "Scheme Fees (NC)", "Interchange (NC)",), + ) + + def _sum_amount_values(self, row, columns): + """Sum the amounts from the columns passed.""" + amount = 0.0 + for column in columns: + value = self._get_value(row, column) + if value: + amount += float(value) + return amount + + def _get_transaction(self, row): + """Get transaction from row. + + This can easily be overwritten in custom modules to add extra information. + """ + merchant_account = self._get_value(row, "Merchant Account") + psp_reference = self._get_value(row, "Psp Reference") + merchant_reference = self._get_value(row, "Merchant Reference") + payment_method = self._get_value(row, "Payment Method Variant") + modification_reference = self._get_value(row, "Modification Reference") + transaction = { + "date": self._get_transaction_date(row), + "amount": self._balance(row), + } + transaction["note"] = " ".join( + [ + part + for part in [ + merchant_account, + psp_reference, + merchant_reference, + payment_method, + ] + if part + ] + ) + transaction["name"] = ( + merchant_reference or psp_reference or modification_reference + ) + transaction["ref"] = ( + psp_reference or modification_reference or merchant_reference + ) + transaction["transaction_type"] = self._get_value(row, "Type") + return transaction + + def _append_fees_transaction(self, statement, fees, batch_number): + """Single transaction for all fees in statement.""" + max_date = max(t["date"] for t in statement["transactions"]) + transaction = { + "date": max_date, + "amount": -fees, + "name": "Commission, markup etc. batch %s" % batch_number, + } + self._append_transaction(statement, transaction) + + def _append_transaction(self, statement, transaction): + """Add transaction with unique import id to statement.""" + # Statement date is date of earliest transaction in file. + if transaction["date"] < statement.get("date"): + statement["date"] = transaction["date"] + transaction["unique_import_id"] = self._get_unique_import_id(statement) + statement["transactions"].append(transaction) + + def _get_unique_import_id(self, statement): + """get unique import ID for transaction.""" + return statement["name"] + str(len(statement["transactions"])).zfill(4) diff --git a/account_bank_statement_import_adyen/models/account_journal.py b/account_bank_statement_import_adyen/models/account_journal.py new file mode 100644 index 00000000..605fc528 --- /dev/null +++ b/account_bank_statement_import_adyen/models/account_journal.py @@ -0,0 +1,20 @@ +# Copyright 2017 Opener BV () +# Copyright 2020 Vanmoof BV () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +from odoo import fields, models + + +class AccountJournal(models.Model): + _inherit = "account.journal" + + adyen_merchant_account = fields.Char( + help=( + "Fill in the exact merchant account string to select this " + "journal when importing Adyen statements" + ) + ) + + def _get_bank_statements_available_import_formats(self): + res = super()._get_bank_statements_available_import_formats() + res.append("adyen") + return res diff --git a/account_bank_statement_import_adyen/readme/CONFIGURE.rst b/account_bank_statement_import_adyen/readme/CONFIGURE.rst new file mode 100644 index 00000000..0f7870bd --- /dev/null +++ b/account_bank_statement_import_adyen/readme/CONFIGURE.rst @@ -0,0 +1,3 @@ +Configure a pseudo bank journal by creating a new journal linked to your Adyen +merchant account. Set your merchant account string in the Advanced settings +on the journal form. diff --git a/account_bank_statement_import_adyen/readme/CONTRIBUTORS.rst b/account_bank_statement_import_adyen/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..f00439e5 --- /dev/null +++ b/account_bank_statement_import_adyen/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Stefan Rijnhart (https://opener.amsterdam) +* Martin Pishpecki (https://www.vanmoof.com) +* Ronald Portier (https://therp.nl) diff --git a/account_bank_statement_import_adyen/readme/DESCRIPTION.rst b/account_bank_statement_import_adyen/readme/DESCRIPTION.rst new file mode 100644 index 00000000..c07218ef --- /dev/null +++ b/account_bank_statement_import_adyen/readme/DESCRIPTION.rst @@ -0,0 +1,8 @@ +This module processes Adyen transaction statements, the settlement details report, +in excel or csv format. + +You can import the statements in a dedicated journal. Reconcile your sale invoices +with the credit transations. Reconcile the aggregated counterpart +transaction with the transaction in your real bank journal and register the +aggregated fee line containing commision and markup on the applicable +cost account. diff --git a/account_bank_statement_import_adyen/readme/USAGE.rst b/account_bank_statement_import_adyen/readme/USAGE.rst new file mode 100644 index 00000000..70545a9f --- /dev/null +++ b/account_bank_statement_import_adyen/readme/USAGE.rst @@ -0,0 +1,3 @@ +After installing this module, you can import your Adyen transaction statements +through Menu Finance -> Bank -> Import. Don't enter a journal in the import +wizard. diff --git a/account_bank_statement_import_adyen/static/description/index.html b/account_bank_statement_import_adyen/static/description/index.html new file mode 100644 index 00000000..7d826df9 --- /dev/null +++ b/account_bank_statement_import_adyen/static/description/index.html @@ -0,0 +1,442 @@ + + + + + + +Adyen statement import + + + +
+

Adyen statement import

+ + +

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

+

This module processes Adyen transaction statements, the settlement details report, +in excel or csv format.

+

You can import the statements in a dedicated journal. Reconcile your sale invoices +with the credit transations. Reconcile the aggregated counterpart +transaction with the transaction in your real bank journal and register the +aggregated fee line containing commision and markup on the applicable +cost account.

+

Table of contents

+ +
+

Configuration

+

Configure a pseudo bank journal by creating a new journal linked to your Adyen +merchant account. Set your merchant account string in the Advanced settings +on the journal form.

+
+
+

Usage

+

After installing this module, you can import your Adyen transaction statements +through Menu Finance -> Bank -> Import. Don’t enter a journal in the import +wizard.

+
+
+

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

+
    +
  • Opener BV
  • +
  • Vanmoof 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_adyen/test_files/adyen_test.xlsx b/account_bank_statement_import_adyen/test_files/adyen_test.xlsx new file mode 100644 index 00000000..b7cd4c6c Binary files /dev/null and b/account_bank_statement_import_adyen/test_files/adyen_test.xlsx differ diff --git a/account_bank_statement_import_adyen/test_files/adyen_test_credit_fees.xlsx b/account_bank_statement_import_adyen/test_files/adyen_test_credit_fees.xlsx new file mode 100644 index 00000000..c4a786de Binary files /dev/null and b/account_bank_statement_import_adyen/test_files/adyen_test_credit_fees.xlsx differ diff --git a/account_bank_statement_import_adyen/test_files/adyen_test_invalid.xls b/account_bank_statement_import_adyen/test_files/adyen_test_invalid.xls new file mode 100644 index 00000000..c7e3eb28 Binary files /dev/null and b/account_bank_statement_import_adyen/test_files/adyen_test_invalid.xls differ diff --git a/account_bank_statement_import_adyen/test_files/settlement_detail_report_batch_238.csv b/account_bank_statement_import_adyen/test_files/settlement_detail_report_batch_238.csv new file mode 100644 index 00000000..7060b966 --- /dev/null +++ b/account_bank_statement_import_adyen/test_files/settlement_detail_report_batch_238.csv @@ -0,0 +1,4 @@ +Company Account,Merchant Account,Psp Reference,Merchant Reference,Payment Method,Creation Date,TimeZone,Type,Modification Reference,Gross Currency,Gross Debit (GC),Gross Credit (GC),Exchange Rate,Net Currency,Net Debit (NC),Net Credit (NC),Commission (NC),Markup (NC),Scheme Fees (NC),Interchange (NC),Payment Method Variant,Modification Merchant Reference,Batch Number,Reserved4,Reserved5,Reserved6,Reserved7,Reserved8,Reserved9,Reserved10 +CompanyNL,YOURCOMPANY_ACCOUNT,,,,2022-02-22 00:24:23,CET,Balancetransfer,Balancetransfer,,,,,USD,,454331.99,,,,,,Balancetransfer from batch 237,238,,,,,,, +CompanyNL,YOURCOMPANY_ACCOUNT,,,,2022-03-02 02:21:49,CET,Fee,Transaction Fees March 01 2022,,,,,USD,0.09,,,,,,,,238,,,,,,, +CompanyNL,YOURCOMPANY_ACCOUNT,,,,2022-03-02 02:21:49,CET,Balancetransfer,Balancetransfer,,,,,USD,454331.90,,,,,,,Balancetransfer to batch 239,238,,,,,,, diff --git a/account_bank_statement_import_adyen/test_files/settlement_detail_report_batch_380.csv b/account_bank_statement_import_adyen/test_files/settlement_detail_report_batch_380.csv new file mode 100644 index 00000000..ff130166 --- /dev/null +++ b/account_bank_statement_import_adyen/test_files/settlement_detail_report_batch_380.csv @@ -0,0 +1,229 @@ +Company Account,Merchant Account,Psp Reference,Merchant Reference,Payment Method,Creation Date,TimeZone,Type,Modification Reference,Gross Currency,Gross Debit (GC),Gross Credit (GC),Exchange Rate,Net Currency,Net Debit (NC),Net Credit (NC),Commission (NC),Markup (NC),Scheme Fees (NC),Interchange (NC),Payment Method Variant,Batch Number,Reserved4,Reserved5,Reserved6,Reserved7,Reserved8,Reserved9,Reserved10,Modification Merchant Reference,Booking Date,Booking Date TimeZone +CompanyNL,YOURCOMPANY_ACCOUNT,1829098024817852,CM1000028854,mc,2021-01-05 00:21:32,CET,Settled,7429098024927090,USD,,31.45,1,USD,,31.15,,0.16,0.05,0.09,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4636098029442802,CM2000162856,visa,2021-01-05 00:29:21,CET,Settled,7936098029610473,USD,,21.95,1,USD,,21.74,,0.11,0.03,0.07,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1736098031315223,CM7000054248,visa,2021-01-05 00:32:20,CET,Settled,7436098031406030,USD,,26.45,1,USD,,26.2,,0.14,0.03,0.08,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1316098037405950,CM3000151362,directEbanking,2021-01-05 00:43:27,CET,Settled,1316098037405950,USD,,96.9,1,USD,,95.93,0.97,,,,directEbanking,380,,,,,,,,CM3000151362,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1656098094611035,CM2000162861,mc,2021-01-05 02:18:53,CET,Settled,7759098095331123,USD,,589.75,1,USD,,584.48,,3.07,1.02,1.18,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1316098263305981,CM2000162863,ideal,2021-01-05 06:59:37,CET,Settled,1316098263305981,USD,,26.45,1,USD,,26.2,0.25,,,,idealtriodos,380,,,,,,,,CM2000162863,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6119098279552327,CM2000162864,ideal,2021-01-05 07:26:28,CET,Settled,6119098279552327,USD,,116.3,1,USD,,116.05,0.25,,,,idealing,380,,,,,,,,CM2000162864,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1516098280206459,CM1000028855,ideal,2021-01-05 07:27:26,CET,Settled,1516098280206459,USD,,26.45,1,USD,,26.2,0.25,,,,idealasn,380,,,,,,,,CM1000028855,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1719098288495570,CM7000054252,cartebancaire,2021-01-05 07:42:17,CET,Settled,2319098288620641,USD,,24.95,1,USD,,24.72,,0.15,0.01,0.07,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098301438837,CM7000054253,cartebancaire,2021-01-05 08:04:27,CET,Settled,5316098302004588,USD,,119.75,1,USD,,118.78,,0.72,0.01,0.24,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1816098304031443,CM1000028856,ideal,2021-01-05 08:07:05,CET,Settled,1816098304031443,USD,,66.45,1,USD,,66.2,0.25,,,,idealasn,380,,,,,,,,CM1000028856,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6219098308593440,CM7000054254,cartebancaire,2021-01-05 08:16:46,CET,Settled,2416098309442597,USD,,79.85,1,USD,,79.2,,0.48,0.01,0.16,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619093887226154,CM7000053968,bankTransfer_IBAN,2021-01-05 08:25:01,CET,Settled,1619093887226154,USD,,518.9,1,USD,,518.7,0.2,,,,bankTransfer_IBAN,380,,,,,,,,CM7000053968,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4316095884890882,CM1000028786,bankTransfer_NL,2021-01-05 08:25:18,CET,Settled,4316095884890882,USD,,1044.35,1,USD,,1044.15,0.2,,,,bankTransfer_NL,380,,,,,,,,CM1000028786,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1816098318146617,CM1000028857,ideal,2021-01-05 08:30:59,CET,Settled,1816098318146617,USD,,66.45,1,USD,,66.2,0.25,,,,idealing,380,,,,,,,,CM1000028857,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4556098318416786,CM2000162866,visa,2021-01-05 08:32:58,CET,Settled,7659098319786491,USD,,81.85,1,USD,,81.22,,0.43,0.04,0.16,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1816098325040696,CM1000028858,ideal,2021-01-05 08:42:48,CET,Settled,1816098325040696,USD,,26.45,1,USD,,26.2,0.25,,,,idealasn,380,,,,,,,,CM1000028858,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1559098334575279,CM1000028859,bcmc_mobile,2021-01-05 08:57:39,CET,Settled,7759098334591982,USD,,26.45,1,USD,,26.22,,0.16,0.02,0.05,bcmc_mobile,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6239098336305763,CM2000162873,visa,2021-01-05 09:02:04,CET,Settled,7936098337243280,USD,,565.8,1,USD,,561.55,,2.94,0.18,1.13,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1359098338215734,CM18000001445,visa,2021-01-05 09:04:16,CET,Settled,7759098338563615,USD,,50.12,1,USD,,48.91,,0.26,0.2,0.75,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1539098339357892,CM3000151370,visa,2021-01-05 09:05:38,CET,Settled,7439098339386626,USD,,30.9,1,USD,,30.12,,0.16,0.16,0.46,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1339098339577947,CM7000054255,visa,2021-01-05 09:06:05,CET,Settled,7439098339659113,USD,,49.85,1,USD,,49.46,,0.26,0.03,0.1,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1536098341845648,CM1000028860,visa,2021-01-05 09:11:00,CET,Settled,7936098342605952,USD,,555.35,1,USD,,550.51,,2.89,0.28,1.67,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1616098342598462,CM3000151371,directEbanking,2021-01-05 09:12:24,CET,Settled,1616098342598462,USD,,555.8,1,USD,,550.24,5.56,,,,directEbanking,380,,,,,,,,CM3000151371,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4646098344291577,CM17000002640,mc,2021-01-05 09:13:55,CET,Settled,7649098344354771,USD,,27.08,1,USD,,26.44,,0.14,0.09,0.41,mcsuperpremiumcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4726098345327373,CM7000054256,mc,2021-01-05 09:15:47,CET,Settled,7926098345475009,USD,,46.4,1,USD,,45.95,,0.24,0.07,0.14,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1856098346315573,CM2000162874,visa,2021-01-05 09:19:29,CET,Settled,7759098347699640,USD,,588.75,1,USD,,584.33,,3.06,0.18,1.18,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4326098349237309,CM3000151372,visa,2021-01-05 09:28:08,CET,Settled,7429098352883956,USD,,475.95,1,USD,,471.8,,2.47,0.25,1.43,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1526098355393578,CM7000054259,visa,2021-01-05 09:33:49,CET,Settled,7426098356298725,USD,,518.9,1,USD,,508.41,,2.7,0.27,7.52,visacommercialcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1726098357414842,CM7000054260,bcmc_mobile,2021-01-05 09:35:48,CET,Settled,7426098357485040,USD,,156.3,1,USD,,155.29,,0.94,0.02,0.05,bcmc_mobile,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1816098357756292,CM3000151374,giropay,2021-01-05 09:39:00,CET,Settled,1816098357756292,USD,,46.85,1,USD,,46.04,0.81,,,,giropay,380,,,,,,,,CM3000151374,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1516098360214266,CM1000028861,ideal,2021-01-05 09:41:03,CET,Settled,1516098360214266,USD,,36.45,1,USD,,36.2,0.25,,,,idealasn,380,,,,,,,,CM1000028861,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6219098360158827,CM3000151377,giropay,2021-01-05 09:43:16,CET,Settled,6219098360158827,USD,,36.9,1,USD,,36.22,0.68,,,,giropay,380,,,,,,,,CM3000151377,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4336098363026289,CM2000162876,visa,2021-01-05 09:45:05,CET,Settled,7936098363059485,USD,,34.9,1,USD,,34.62,,0.18,0.03,0.07,electron,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098365115461,CM2000162878,cartebancaire,2021-01-05 09:49:53,CET,Settled,7916098365186579,USD,,46.45,1,USD,,46.07,,0.28,0.01,0.09,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619098368800567,CM7000054262,cartebancaire,2021-01-05 09:55:45,CET,Settled,7419098368870510,USD,,46.85,1,USD,,46.47,,0.28,0.01,0.09,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1516098372030965,CM1000028862,ideal,2021-01-05 10:00:57,CET,Settled,1516098372030965,USD,,46.4,1,USD,,46.15,0.25,,,,idealing,380,,,,,,,,CM1000028862,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1846098379029995,CM2000162881,visa,2021-01-05 10:11:50,CET,Settled,7549098379106006,USD,,31.9,1,USD,,31.6,,0.17,0.03,0.1,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4636098378101900,CM2000162880,visa,2021-01-05 10:12:27,CET,Settled,7936098379470528,USD,,529.85,1,USD,,525.86,,2.76,0.17,1.06,visasuperpremiumdebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4646080478327021,CM3000149254,visa,2021-01-05 10:17:31,CET,Refunded,4346098382059723,USD,19.95,,1,USD,19.95,,,,,,visastandardcredit,380,,,,,,,,CM3000149254,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1549098388405186,CM17000002641,visa,2021-01-05 10:27:52,CET,Settled,7749098388722759,USD,,487.6,1,USD,,476.46,,2.54,1.29,7.31,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1549098390299692,CM7000054263,visa,2021-01-05 10:31:52,CET,Settled,7749098391124118,USD,,538.85,1,USD,,534.8,,2.8,0.17,1.08,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098392069723,CM7000054264,cartebancaire,2021-01-05 10:34:57,CET,Settled,7916098392205897,USD,,29.9,1,USD,,29.65,,0.18,0.01,0.06,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4516098401930718,CM2000162887,ideal,2021-01-05 10:50:48,CET,Settled,4516098401930718,USD,,66.35,1,USD,,66.1,0.25,,,,idealrabobank,380,,,,,,,,CM2000162887,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6239098403242287,CM7000054268,visa,2021-01-05 10:52:47,CET,Settled,7439098403677975,USD,,483.72,1,USD,,472.97,,2.52,0.25,7.98,visacorporatecredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4316098407246061,CM1000028863,ideal,2021-01-05 10:59:17,CET,Settled,4316098407246061,USD,,6.5,1,USD,,6.25,0.25,,,,idealing,380,,,,,,,,CM1000028863,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4326098409899006,CM3000151391,visa,2021-01-05 11:03:26,CET,Settled,7426098410064121,USD,,141.95,1,USD,,140.7,,0.74,0.08,0.43,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1359098412271835,CM2000162890,mc,2021-01-05 11:07:34,CET,Settled,7759098412548011,USD,,181.75,1,USD,,180.1,,0.95,0.15,0.55,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1539098414025232,CM7000054274,visa,2021-01-05 11:10:17,CET,Settled,7439098414172511,USD,,34.95,1,USD,,34.64,,0.18,0.03,0.1,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1556098414930348,CM7000054275,visa,2021-01-05 11:12:29,CET,Settled,7559098415497986,USD,,478.95,1,USD,,475.35,,2.49,0.15,0.96,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4536098415344183,CM7000054276,mc,2021-01-05 11:13:54,CET,Settled,7439098416347798,USD,,478.95,1,USD,,474.64,,2.49,0.38,1.44,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1849098416334181,CM7000054277,mc,2021-01-05 11:14:33,CET,Settled,7549098416733952,USD,,79.85,1,USD,,79.2,,0.42,0.07,0.16,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1336098417118690,CM2000162891,mc,2021-01-05 11:15:31,CET,Settled,7436098417314824,USD,,69.85,1,USD,,69.22,,0.36,0.06,0.21,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4756098417302497,CM2000162892,visa,2021-01-05 11:15:46,CET,Settled,7659098417466145,USD,,31.9,1,USD,,31.64,,0.17,0.03,0.06,electron,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6249098418547686,CM3000151393,visa,2021-01-05 11:17:48,CET,Settled,7649098418680812,USD,,36.95,1,USD,,36.62,,0.19,0.03,0.11,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619098421158771,CM3000151394,directEbanking,2021-01-05 11:23:00,CET,Settled,1619098421158771,USD,,475.95,1,USD,,471.19,4.76,,,,directEbanking,380,,,,,,,,CM3000151394,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1816098424350301,CM1000028864,ideal,2021-01-05 11:32:29,CET,Settled,1816098424350301,USD,,31.5,1,USD,,31.25,0.25,,,,idealtriodos,380,,,,,,,,CM1000028864,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4746098428746750,CM15000004736,visa,2021-01-05 11:35:45,CET,Settled,7749098429453067,USD,,430.95,1,USD,,427.71,,2.24,0.14,0.86,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1519098432126040,CM3000151396,directEbanking,2021-01-05 11:41:32,CET,Settled,1519098432126040,USD,,555.8,1,USD,,550.24,5.56,,,,directEbanking,380,,,,,,,,CM3000151396,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1516098431938133,CM3000151395,directEbanking,2021-01-05 11:44:06,CET,Settled,1516098431938133,USD,,25.76,1,USD,,25.5,0.26,,,,directEbanking,380,,,,,,,,CM3000151395,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1546098438298972,CM7000054278,visa,2021-01-05 11:50:32,CET,Settled,7549098438328351,USD,,29.9,1,USD,,29.65,,0.16,0.03,0.06,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1336098447468164,CM3000151400,visa,2021-01-05 12:06:23,CET,Settled,7439098447832487,USD,,515.9,1,USD,,512.03,,2.68,0.16,1.03,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4716098449607813,CM1000028865,ideal,2021-01-05 12:09:58,CET,Settled,4716098449607813,USD,,66.45,1,USD,,66.2,0.25,,,,idealasn,380,,,,,,,,CM1000028865,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1649098450600333,CM7000054279,visa,2021-01-05 12:11:47,CET,Settled,7649098451071325,USD,,518.9,1,USD,,515,,2.7,0.16,1.04,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1336098451682403,CM3000151401,visa,2021-01-05 12:14:02,CET,Settled,7436098452422094,USD,,475.95,1,USD,,472.38,,2.47,0.15,0.95,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1719098456224257,CM1000028866,ideal,2021-01-05 12:20:53,CET,Settled,1719098456224257,USD,,26.45,1,USD,,26.2,0.25,,,,idealrabobank,380,,,,,,,,CM1000028866,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4746098458272701,CM7000054280,mc,2021-01-05 12:29:11,CET,Settled,7649098461512151,USD,,548.85,1,USD,,544.47,,2.85,0.43,1.1,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098461703368,CM1000028867,ideal,2021-01-05 12:31:21,CET,Settled,4616098461703368,USD,,66.45,1,USD,,66.2,0.25,,,,idealtriodos,380,,,,,,,,CM1000028867,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1749098464912244,CM2000162894,mc,2021-01-05 12:34:56,CET,Settled,7749098464964093,USD,,6.95,1,USD,,6.89,,0.04,0.01,0.01,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1756098464186658,CM20000002451,mc,2021-01-05 12:35:13,CET,Settled,7559098465135312,USD,,561.85,1,USD,,556.8,,2.92,0.44,1.69,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1756098478581449,CM2000162895,visa,2021-01-05 12:57:49,CET,Settled,7559098478696391,USD,,26.45,1,USD,,26.2,,0.14,0.03,0.08,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1529098480373559,CM2000162897,visa,2021-01-05 13:01:40,CET,Settled,7429098481008681,USD,,535.4,1,USD,,530.74,,2.78,0.27,1.61,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4816098481304518,CM1000028869,ideal,2021-01-05 13:03:17,CET,Settled,4816098481304518,USD,,515.45,1,USD,,515.2,0.25,,,,idealrabobank,380,,,,,,,,CM1000028869,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4556098484634014,CM7000054282,mc,2021-01-05 13:08:07,CET,Settled,7759098484873909,USD,,468.85,1,USD,,465.24,,2.44,0.23,0.94,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1519098493524448,CM3000151406,directEbanking,2021-01-05 13:23:37,CET,Settled,1519098493524448,USD,,26.9,1,USD,,26.63,0.27,,,,directEbanking,380,,,,,,,,CM3000151406,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4536098501532824,CM3000151407,visa,2021-01-05 13:35:55,CET,Settled,7936098501550114,USD,,26.9,1,USD,,26.65,,0.14,0.03,0.08,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1346098502166016,CM15000004737,visa,2021-01-05 13:37:28,CET,Settled,7549098502485178,USD,,51.95,1,USD,,51.55,,0.27,0.03,0.1,electron,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4516098503744553,CM3000151408,directEbanking,2021-01-05 13:39:59,CET,Settled,4516098503744553,USD,,26.9,1,USD,,26.63,0.27,,,,directEbanking,380,,,,,,,,CM3000151408,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619098504352119,CM7000054284,cartebancaire,2021-01-05 13:42:59,CET,Settled,7419098505011440,USD,,149.75,1,USD,,148.54,,0.9,0.01,0.3,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4646098509498355,CM7000054285,mc,2021-01-05 13:49:43,CET,Settled,7649098509837982,USD,,548.85,1,USD,,543.94,,2.85,0.96,1.1,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1316098518102027,CM7000054288,cartebancaire,2021-01-05 14:05:26,CET,Settled,2419098518485053,USD,,82.85,1,USD,,82.18,,0.5,,0.17,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1716098520371467,CM7000054289,cartebancaire,2021-01-05 14:09:36,CET,Settled,7916098520830012,USD,,448.9,1,USD,,444.86,,2.69,,1.35,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1319098525213079,CM7000054290,cartebancaire,2021-01-05 14:17:08,CET,Settled,5416098525657484,USD,,591.75,1,USD,,587.01,,3.55,0.01,1.18,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1616098530359040,CM2000162903,directEbanking,2021-01-05 14:28:02,CET,Settled,1616098530359040,USD,,26.9,1,USD,,26.63,0.27,,,,directEbanking,380,,,,,,,,CM2000162903,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6219098534473078,CM7000054291,cartebancaire,2021-01-05 14:33:16,CET,Settled,7916098534916500,USD,,69.95,1,USD,,69.38,,0.42,0.01,0.14,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1856098543755332,CM2000162908,visa,2021-01-05 14:47:13,CET,Settled,7559098544336766,USD,,545.4,1,USD,,541.3,,2.84,0.17,1.09,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1516098545972663,CM1000028870,ideal,2021-01-05 14:50:37,CET,Settled,1516098545972663,USD,,545.4,1,USD,,545.15,0.25,,,,idealing,380,,,,,,,,CM1000028870,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1316098546477771,CM1000028871,ideal,2021-01-05 14:51:41,CET,Settled,1316098546477771,USD,,31.45,1,USD,,31.2,0.25,,,,idealing,380,,,,,,,,CM1000028871,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4716098547580789,CM1000028872,ideal,2021-01-05 14:55:11,CET,Settled,4716098547580789,USD,,585.3,1,USD,,585.05,0.25,,,,idealasn,380,,,,,,,,CM1000028872,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1359098553987017,CM2000162909,mc,2021-01-05 15:04:09,CET,Settled,7659098554493019,USD,,475.95,1,USD,,471.67,,2.47,0.38,1.43,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098558319300,CM7000054292,cartebancaire,2021-01-05 15:12:36,CET,Settled,2419098558828295,USD,,448.9,1,USD,,444.86,,2.69,,1.35,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4316098560947976,CM1000028873,ideal,2021-01-05 15:16:52,CET,Settled,4316098560947976,USD,,56.45,1,USD,,56.2,0.25,,,,idealtriodos,380,,,,,,,,CM1000028873,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1336098559877129,CM3000151416,visa,2021-01-05 15:17:04,CET,Settled,7936098562244607,USD,,68.84,1,USD,,68.3,,0.36,0.04,0.14,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1316098564691485,CM7000054293,cartebancaire,2021-01-05 15:22:18,CET,Settled,2416098564712379,USD,,29.9,1,USD,,29.65,,0.18,0.01,0.06,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4626098566791803,CM15000004738,mc,2021-01-05 15:25:39,CET,Settled,7426098567395492,USD,,430.95,1,USD,,427.51,,2.24,0.34,0.86,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1819098565442906,CM3000151418,directEbanking,2021-01-05 15:25:56,CET,Settled,1819098565442906,USD,,31.95,1,USD,,31.63,0.32,,,,directEbanking,380,,,,,,,,CM3000151418,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6219098567337430,CM3000151420,directEbanking,2021-01-05 15:28:44,CET,Settled,6219098567337430,USD,,545.85,1,USD,,540.39,5.46,,,,directEbanking,380,,,,,,,,CM3000151420,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6219098570269216,CM7000054294,cartebancaire,2021-01-05 15:31:34,CET,Settled,5316098570350937,USD,,24.95,1,USD,,24.72,,0.15,0.01,0.07,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1529098572249212,CM14000007552,mc,2021-01-05 15:34:04,CET,Settled,7429098572448465,USD,,60.9,1,USD,,60.43,,0.32,0.03,0.12,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4345895611165986,CM300122499,mc,2021-01-05 15:36:57,CET,Refunded,6249098573617340,USD,75,,1,USD,75,,,,,,mcstandardcredit,380,,,,,,,,CM300122499,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4846098575089755,CM7000054295,visa,2021-01-05 15:39:25,CET,Settled,7549098575651482,USD,,99.8,1,USD,,99.04,,0.52,0.04,0.2,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619098584477539,CM7000054297,cartebancaire,2021-01-05 15:55:31,CET,Settled,7419098584590322,USD,,24.95,1,USD,,24.72,,0.15,0.01,0.07,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4756098584131257,CM3000151423,visa,2021-01-05 15:55:33,CET,Settled,7659098585336906,USD,,515.85,1,USD,,511.36,,2.68,0.26,1.55,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1559098598347829,CM2000162911,visa,2021-01-05 16:18:43,CET,Settled,7559098599235848,USD,,81.85,1,USD,,81.11,,0.43,0.06,0.25,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619098601176056,CM7000054300,cartebancaire,2021-01-05 16:23:48,CET,Settled,2319098601657122,USD,,498.9,1,USD,,494.9,,2.99,0.01,1,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1716098602170803,CM7000054301,cartebancaire,2021-01-05 16:25:44,CET,Settled,7419098602620564,USD,,498.9,1,USD,,494.9,,2.99,0.01,1,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4546098602926519,CM3000151428,mc,2021-01-05 16:26:17,CET,Settled,7549098603771203,USD,,545.85,1,USD,,540.94,,2.84,0.43,1.64,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1319098608380340,CM2000162914,cartebancaire,2021-01-05 16:36:08,CET,Settled,2319098609032963,USD,,498.85,1,USD,,494.85,,2.99,0.01,1,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6119098607954245,CM7000054305,cartebancaire,2021-01-05 16:36:08,CET,Settled,7419098609041681,USD,,568.8,1,USD,,563.68,,3.41,,1.71,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4846098611011177,CM3000151434,mc,2021-01-05 16:39:03,CET,Settled,7649098611430437,USD,,545.85,1,USD,,540.94,,2.84,0.43,1.64,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6159098611216053,CM2000162917,visa,2021-01-05 16:39:34,CET,Settled,7559098611741815,USD,,944.95,1,USD,,937.87,,4.91,0.28,1.89,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4746098616887887,CM20000002452,visa,2021-01-05 16:48:34,CET,Settled,7649098617149445,USD,,137.8,1,USD,,136.59,,0.72,0.08,0.41,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4316098616561235,CM1000028874,ideal,2021-01-05 16:48:56,CET,Settled,4316098616561235,USD,,585.3,1,USD,,585.05,0.25,,,,idealrabobank,380,,,,,,,,CM1000028874,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1315962210023024,CM700045716,cartebancaire,2021-01-05 16:50:11,CET,Refunded,1316098617350832,USD,461.5,,1,USD,461.5,,,,,,cartebancaire,380,,,,,,,,CM700045716,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1656098619840762,CM7000054306,mc,2021-01-05 16:54:03,CET,Settled,7659098620437669,USD,,508.8,1,USD,,504.73,,2.65,0.4,1.02,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098621031858,CM7000054307,cartebancaire,2021-01-05 16:57:14,CET,Settled,2416098621638476,USD,,518.85,1,USD,,514.69,,3.11,0.01,1.04,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1836098626077492,CM2000162919,visadankort,2021-01-05 17:04:12,CET,Settled,7436098626521458,USD,,479.95,1,USD,,476.34,,2.5,0.15,0.96,visadankort,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1616098632664453,CM1000028875,ideal,2021-01-05 17:15:04,CET,Settled,1616098632664453,USD,,26.45,1,USD,,26.2,0.25,,,,idealing,380,,,,,,,,CM1000028875,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4516098634301083,CM7000054308,cartebancaire,2021-01-05 17:19:50,CET,Settled,7419098635052389,USD,,423.9,1,USD,,420.5,,2.54,0.01,0.85,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1549098641389649,CM2000162922,mc,2021-01-05 17:29:43,CET,Settled,7549098641835796,USD,,552.85,1,USD,,547.89,,2.87,0.43,1.66,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1839098643550890,CM20000002453,mc,2021-01-05 17:33:13,CET,Settled,7439098643930630,USD,,120.8,1,USD,,119.87,,0.63,0.06,0.24,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6119098644839953,CM3000151444,directEbanking,2021-01-05 17:36:39,CET,Settled,6119098644839953,USD,,50.85,1,USD,,50.34,0.51,,,,directEbanking,380,,,,,,,,CM3000151444,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4615982720540185,CM300134351,amex,2021-01-05 17:40:58,CET,Refunded,1816098648122627,USD,76.5,,1,USD,76.5,,,,,,amex,380,,,,,,,,CM300134351,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4646098645930352,CM2000162924,maestro,2021-01-05 17:41:15,CET,Settled,7649098648754767,USD,,569.8,1,USD,,565.57,,2.96,0.13,1.14,maestro,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1529098653630884,CM7000054309,mc,2021-01-05 17:50:23,CET,Settled,7429098654237844,USD,,568.8,1,USD,,564.25,,2.96,0.45,1.14,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098657908961,CM3000151449,directEbanking,2021-01-05 17:59:16,CET,Settled,4616098657908961,USD,,495.85,1,USD,,490.89,4.96,,,,directEbanking,380,,,,,,,,CM3000151449,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1316037899193429,CM300143509,directEbanking,2021-01-05 17:59:56,CET,Refunded,1816098659464421,USD,40,,1,USD,40.2,,0.2,,,,directEbanking,380,,,,,,,,CM300143509,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4316098660263282,CM1000028876,ideal,2021-01-05 18:00:55,CET,Settled,4316098660263282,USD,,56.45,1,USD,,56.2,0.25,,,,idealabn,380,,,,,,,,CM1000028876,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1816098662718979,CM7000054310,cartebancaire,2021-01-05 18:06:44,CET,Settled,7419098663303530,USD,,82.85,1,USD,,82.09,,0.5,0.01,0.25,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4526098663485664,CM15000004740,mc,2021-01-05 18:07:38,CET,Settled,7429098664581298,USD,,480.95,1,USD,,477.11,,2.5,0.38,0.96,mcpremiumdebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1519098664619084,CM7000054312,cartebancaire,2021-01-05 18:09:39,CET,Settled,2419098665064800,USD,,511.9,1,USD,,507.29,,3.07,,1.54,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1816057939971662,CM100027779,ideal,2021-01-05 18:16:35,CET,Refunded,1816098669505999,USD,419,,1,USD,419.2,,0.2,,,,idealing,380,,,,,,,,CM100027779,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1816098671105077,CM3000151454,directEbanking,2021-01-05 18:20:15,CET,Settled,1816098671105077,USD,,26.9,1,USD,,26.63,0.27,,,,directEbanking,380,,,,,,,,CM3000151454,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4336098673118875,CM14000007554,visa,2021-01-05 18:22:04,CET,Settled,7936098673241641,USD,,30.9,1,USD,,30.65,,0.16,0.03,0.06,electron,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1346098678442712,CM2000162927,mc,2021-01-05 18:30:51,CET,Settled,7549098678514694,USD,,26.45,1,USD,,26.19,,0.14,0.07,0.05,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1719098683770023,CM1000028879,ideal,2021-01-05 18:40:34,CET,Settled,1719098683770023,USD,,555.35,1,USD,,555.1,0.25,,,,idealing,380,,,,,,,,CM1000028879,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1536098687703419,CM2000162928,bcmc_mobile,2021-01-05 18:46:16,CET,Settled,7436098687766513,USD,,46.45,1,USD,,46.1,,0.28,0.02,0.05,bcmc_mobile,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4716098688894825,CM7000054314,cartebancaire,2021-01-05 18:49:46,CET,Settled,5316098689026329,USD,,41.55,1,USD,,40.92,,0.25,0.01,0.37,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1326098689284388,CM15000004743,mc,2021-01-05 18:49:58,CET,Settled,7429098689984352,USD,,590.75,1,USD,,586.04,,3.07,0.46,1.18,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1716098689923686,CM2000162929,ideal,2021-01-05 18:50:42,CET,Settled,1716098689923686,USD,,26.45,1,USD,,26.2,0.25,,,,idealasn,380,,,,,,,,CM2000162929,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1729098690327724,CM3000151457,mc,2021-01-05 18:50:48,CET,Settled,7429098690481562,USD,,46.85,1,USD,,46.4,,0.24,0.07,0.14,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1519098693348945,CM7000054315,cartebancaire,2021-01-05 18:57:03,CET,Settled,7419098693472693,USD,,49.9,1,USD,,49.49,,0.3,0.01,0.1,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4646098695089323,CM2000162931,visa,2021-01-05 18:58:45,CET,Settled,7649098695253291,USD,,120.85,1,USD,,119.79,,0.63,0.07,0.36,visapremiumcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4346098695635193,CM7000054316,mc,2021-01-05 18:59:28,CET,Settled,7649098695683588,USD,,39.9,1,USD,,39.55,,0.21,0.06,0.08,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1759098701345718,CM7000054318,bcmc_mobile,2021-01-05 19:09:01,CET,Settled,7759098701412051,USD,,76.4,1,USD,,75.87,,0.46,0.02,0.05,bcmc_mobile,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1516098702846445,CM1000028880,ideal,2021-01-05 19:12:30,CET,Settled,1516098702846445,USD,,26.5,1,USD,,26.25,0.25,,,,idealing,380,,,,,,,,CM1000028880,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098706070300,CM7000054319,cartebancaire,2021-01-05 19:19:07,CET,Settled,5416098706208941,USD,,44.95,1,USD,,44.58,,0.27,0.01,0.09,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1716098711894517,CM2000162933,cartebancaire,2021-01-05 19:28:37,CET,Settled,2319098712384350,USD,,513.9,1,USD,,509.27,,3.08,0.01,1.54,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1349098713988957,CM3000151465,visa,2021-01-05 19:30:33,CET,Settled,7649098714337109,USD,,495.85,1,USD,,491.53,,2.58,0.25,1.49,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1516098724985007,CM7000054321,cartebancaire,2021-01-05 19:49:26,CET,Settled,7416098725000549,USD,,49.85,1,USD,,49.44,,0.3,0.01,0.1,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1626098730490973,CM2000162936,visadankort,2021-01-05 19:57:44,CET,Settled,7426098730644701,USD,,25.95,1,USD,,25.75,,0.13,0.02,0.05,visadankort,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1759098739207500,CM7000054323,visa,2021-01-05 20:12:07,CET,Settled,7759098739276361,USD,,49.9,1,USD,,49.51,,0.26,0.03,0.1,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4516098746917404,CM1000028882,ideal,2021-01-05 20:27:44,CET,Settled,4516098746917404,USD,,106.3,1,USD,,106.05,0.25,,,,idealrabobank,380,,,,,,,,CM1000028882,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4816098754982347,CM2000162937,directEbanking,2021-01-05 20:40:50,CET,Settled,4816098754982347,USD,,589.75,1,USD,,583.85,5.9,,,,directEbanking,380,,,,,,,,CM2000162937,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1639098765132529,CM3000151476,mc,2021-01-05 20:55:25,CET,Settled,7439098765255709,USD,,41.95,1,USD,,41.54,,0.22,0.06,0.13,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4826098775960486,CM7000054324,mc,2021-01-05 21:14:10,CET,Settled,7926098776500820,USD,,548.8,1,USD,,544.42,,2.85,0.43,1.1,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4516098776825980,CM1000028883,ideal,2021-01-05 21:15:31,CET,Settled,4516098776825980,USD,,46.45,1,USD,,46.2,0.25,,,,idealing,380,,,,,,,,CM1000028883,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619098777850542,CM1000028885,ideal,2021-01-05 21:16:58,CET,Settled,1619098777850542,USD,,475.5,1,USD,,475.25,0.25,,,,idealtriodos,380,,,,,,,,CM1000028885,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1516098777260506,CM1000028884,ideal,2021-01-05 21:17:01,CET,Settled,1516098777260506,USD,,495.45,1,USD,,495.2,0.25,,,,idealrabobank,380,,,,,,,,CM1000028884,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1819098778201990,CM7000054326,cartebancaire,2021-01-05 21:18:59,CET,Settled,7416098778786085,USD,,99.9,1,USD,,99.09,,0.6,0.01,0.2,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1516098778907329,CM2000162939,giropay,2021-01-05 21:19:25,CET,Settled,1516098778907329,USD,,545.85,1,USD,,538.55,7.3,,,,giropay,380,,,,,,,,CM2000162939,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1719098782535640,CM1000028887,ideal,2021-01-05 21:24:58,CET,Settled,1719098782535640,USD,,475.5,1,USD,,475.25,0.25,,,,idealrabobank,380,,,,,,,,CM1000028887,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4736098783434390,CM1000028886,bcmc_mobile,2021-01-05 21:25:58,CET,Settled,7936098783588667,USD,,26.45,1,USD,,26.22,,0.16,0.02,0.05,bcmc_mobile,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4516098785683537,CM3000151480,directEbanking,2021-01-05 21:30:25,CET,Settled,4516098785683537,USD,,515.9,1,USD,,510.74,5.16,,,,directEbanking,380,,,,,,,,CM3000151480,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4856098786324808,CM7000054327,visa,2021-01-05 21:31:23,CET,Settled,7759098786834369,USD,,24.95,1,USD,,24.75,,0.13,0.02,0.05,visastandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1859098787109292,CM1000028888,bcmc_mobile,2021-01-05 21:32:08,CET,Settled,7759098787289522,USD,,515.45,1,USD,,512.29,,3.09,0.02,0.05,bcmc_mobile,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1839098789585718,CM7000054329,mc,2021-01-05 21:37:01,CET,Settled,7436098790217453,USD,,545.4,1,USD,,540.49,,2.84,0.43,1.64,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4326098790016921,CM20000002454,mc,2021-01-05 21:37:01,CET,Settled,7426098790215798,USD,,571.85,1,USD,,560.85,,2.97,1.45,6.58,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1716098792435313,CM3000151481,directEbanking,2021-01-05 21:42:07,CET,Settled,1716098792435313,USD,,46.9,1,USD,,46.43,0.47,,,,directEbanking,380,,,,,,,,CM3000151481,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098795263410,CM3000151483,directEbanking,2021-01-05 21:46:44,CET,Settled,4616098795263410,USD,,76.85,1,USD,,76.08,0.77,,,,directEbanking,380,,,,,,,,CM3000151483,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1316098795574641,CM1000028889,ideal,2021-01-05 21:47:20,CET,Settled,1316098795574641,USD,,46.45,1,USD,,46.2,0.25,,,,idealrabobank,380,,,,,,,,CM1000028889,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1656098797179298,CM1000028890,visa,2021-01-05 21:52:25,CET,Settled,7659098799454966,USD,,430.95,1,USD,,427.2,,2.24,0.22,1.29,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1319098800205881,CM2000162940,ideal,2021-01-05 21:54:35,CET,Settled,1319098800205881,USD,,465.4,1,USD,,465.15,0.25,,,,idealrabobank,380,,,,,,,,CM2000162940,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098801919765,CM1000028891,ideal,2021-01-05 22:00:31,CET,Settled,4616098801919765,USD,,51.5,1,USD,,51.25,0.25,,,,idealrabobank,380,,,,,,,,CM1000028891,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098803860017,CM7000054331,cartebancaire,2021-01-05 22:02:17,CET,Settled,7416098804619375,USD,,292.65,1,USD,,290.3,,1.76,,0.59,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1559098804925731,CM2000162941,mc,2021-01-05 22:02:37,CET,Settled,7759098805570275,USD,,549.85,1,USD,,543.95,,2.86,1.39,1.65,mcsuperpremiumcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6119098806188504,CM2000162942,ideal,2021-01-05 22:04:04,CET,Settled,6119098806188504,USD,,46.45,1,USD,,46.2,0.25,,,,idealing,380,,,,,,,,CM2000162942,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4756098806465830,CM2000162943,mc,2021-01-05 22:04:52,CET,Settled,7759098806920040,USD,,565.8,1,USD,,560.72,,2.94,0.44,1.7,mcstandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6129098808836025,CM7000054332,visa,2021-01-05 22:08:11,CET,Settled,7426098808917344,USD,,39.9,1,USD,,39.53,,0.21,0.04,0.12,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1856098811821154,CM1000028893,bcmc_mobile,2021-01-05 22:13:17,CET,Settled,7559098811975692,USD,,106.35,1,USD,,105.64,,0.64,0.02,0.05,bcmc_mobile,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4816098813893485,CM7000054333,cartebancaire,2021-01-05 22:17:44,CET,Settled,7916098813938027,USD,,34.95,1,USD,,34.66,,0.21,0.01,0.07,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4816098814282134,CM3000151485,directEbanking,2021-01-05 22:18:11,CET,Settled,4816098814282134,USD,,21.95,1,USD,,21.73,0.22,,,,directEbanking,380,,,,,,,,CM3000151485,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1819098817721438,CM1000028894,ideal,2021-01-05 22:23:31,CET,Settled,1819098817721438,USD,,46.4,1,USD,,46.15,0.25,,,,idealabn,380,,,,,,,,CM1000028894,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616098818309976,CM1000028895,ideal,2021-01-05 22:24:18,CET,Settled,4616098818309976,USD,,475.5,1,USD,,475.25,0.25,,,,idealrabobank,380,,,,,,,,CM1000028895,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4536098821511581,CM17000002643,visa,2021-01-05 22:29:54,CET,Settled,7439098821946028,USD,,54.83,1,USD,,53.5,,0.29,0.22,0.82,visastandardcredit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4336098821908037,CM3000151488,visa,2021-01-05 22:30:26,CET,Settled,7439098822262839,USD,,515.9,1,USD,,508.59,,2.68,0.16,4.47,visacommercialdebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1556098823411971,CM3000151489,mc,2021-01-05 22:32:32,CET,Settled,7559098823527952,USD,,30.9,1,USD,,30.64,,0.16,0.04,0.06,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1716098823386675,CM7000054335,cartebancaire,2021-01-05 22:34:43,CET,Settled,7916098824278629,USD,,79.85,1,USD,,79.2,,0.48,0.01,0.16,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1816098825320671,CM1000028896,ideal,2021-01-05 22:35:55,CET,Settled,1816098825320671,USD,,86.4,1,USD,,86.15,0.25,,,,idealbunq,380,,,,,,,,CM1000028896,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619097571396090,CM1000028824,bankTransfer_BE,2021-01-05 22:36:22,CET,Settled,1619097571396090,USD,,475.5,1,USD,,475.3,0.2,,,,bankTransfer_BE,380,,,,,,,,CM1000028824,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4816098610331689,CM2000161980,bankTransfer_BE,2021-01-05 22:36:24,CET,Settled,4816098610331689,USD,,508.45,1,USD,,508.25,0.2,,,,bankTransfer_BE,380,,,,,,,,CM2000161980,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4516098825789542,CM7000054337,cartebancaire,2021-01-05 22:38:10,CET,Settled,7916098826286190,USD,,122.75,1,USD,,121.76,,0.74,,0.25,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4546098829397452,CM2000162949,visadankort,2021-01-05 22:43:05,CET,Settled,7549098829859485,USD,,195.8,1,USD,,194.32,,1.02,0.07,0.39,visadankort,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1616096929077843,CM3000151232,bankTransfer_DE,2021-01-05 22:46:23,CET,Settled,1616096929077843,USD,,96.9,1,USD,,96.7,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000151232,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1716097806581567,CM3000151330,bankTransfer_DE,2021-01-05 22:46:25,CET,Settled,1716097806581567,USD,,136.9,1,USD,,136.7,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000151330,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4616093212265072,CM3000150712,bankTransfer_DE,2021-01-05 22:46:27,CET,Settled,4616093212265072,USD,,495.9,1,USD,,495.7,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000150712,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4716094450448429,CM2000162667,bankTransfer_DE,2021-01-05 22:46:27,CET,Settled,4716094450448429,USD,,475.95,1,USD,,475.75,0.2,,,,bankTransfer_DE,380,,,,,,,,CM2000162667,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4716092564273816,CM3000150631,bankTransfer_DE,2021-01-05 22:46:27,CET,Settled,4716092564273816,USD,,505.9,1,USD,,505.7,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000150631,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1719095902053041,CM3000151134,bankTransfer_DE,2021-01-05 22:46:29,CET,Settled,1719095902053041,USD,,21.95,1,USD,,21.75,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000151134,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619097829807427,CM3000151335,bankTransfer_DE,2021-01-05 22:46:35,CET,Settled,1619097829807427,USD,,71.95,1,USD,,71.75,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000151335,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1519094275551766,CM3000150968,bankTransfer_DE,2021-01-05 22:46:36,CET,Settled,1519094275551766,USD,,475.95,1,USD,,475.75,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000150968,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1719094299491781,CM3000150979,bankTransfer_DE,2021-01-05 22:46:42,CET,Settled,1719094299491781,USD,,66.95,1,USD,,66.75,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000150979,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1716096664441385,CM3000151192,bankTransfer_DE,2021-01-05 22:46:59,CET,Settled,1716096664441385,USD,,26.95,1,USD,,26.75,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000151192,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1716097985927094,CM3000151359,bankTransfer_DE,2021-01-05 22:47:01,CET,Settled,1716097985927094,USD,,46.85,1,USD,,46.65,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000151359,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6219093569570674,CM3000150828,bankTransfer_DE,2021-01-05 22:47:07,CET,Settled,6219093569570674,USD,,91.95,1,USD,,91.75,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000150828,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619093490920383,CM3000150799,bankTransfer_DE,2021-01-05 22:47:17,CET,Settled,1619093490920383,USD,,465.9,1,USD,,465.7,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000150799,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4716095921917579,CM2000162731,bankTransfer_DE,2021-01-05 22:47:17,CET,Settled,4716095921917579,USD,,515.9,1,USD,,515.7,0.2,,,,bankTransfer_DE,380,,,,,,,,CM2000162731,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1316093661120967,CM2000162609,bankTransfer_DE,2021-01-05 22:47:17,CET,Settled,1316093661120967,USD,,515.9,1,USD,,515.7,0.2,,,,bankTransfer_DE,380,,,,,,,,CM2000162609,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619094172177714,CM3000150919,bankTransfer_DE,2021-01-05 22:47:17,CET,Settled,1619094172177714,USD,,515.9,1,USD,,515.7,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000150919,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4816091036379804,CM3000150388,bankTransfer_DE,2021-01-05 22:47:18,CET,Settled,4816091036379804,USD,,545.85,1,USD,,545.65,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000150388,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1316095879575577,CM3000151130,bankTransfer_DE,2021-01-05 22:47:18,CET,Settled,1316095879575577,USD,,545.85,1,USD,,545.65,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000151130,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1619098212250449,CM3000151364,bankTransfer_DE,2021-01-05 22:47:20,CET,Settled,1619098212250449,USD,,26.9,1,USD,,26.7,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000151364,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1719082373216828,CM3000149556,bankTransfer_DE,2021-01-05 22:47:24,CET,Settled,1719082373216828,USD,,568.8,1,USD,,568.6,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000149556,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1316098329962825,CM2000162872,bankTransfer_DE,2021-01-05 22:47:28,CET,Settled,1316098329962825,USD,,475.95,1,USD,,475.75,0.2,,,,bankTransfer_DE,380,,,,,,,,CM2000162872,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1519098366040068,CM3000151379,bankTransfer_DE,2021-01-05 22:47:29,CET,Settled,1519098366040068,USD,,61.95,1,USD,,61.75,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000151379,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1319097730887677,CM2000162825,bankTransfer_DE,2021-01-05 22:47:30,CET,Settled,1319097730887677,USD,,475.95,1,USD,,475.75,0.2,,,,bankTransfer_DE,380,,,,,,,,CM2000162825,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1716096125751471,CM3000151166,bankTransfer_DE,2021-01-05 22:47:31,CET,Settled,1716096125751471,USD,,56.85,1,USD,,56.65,0.2,,,,bankTransfer_DE,380,,,,,,,,CM3000151166,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,6119097984495277,CM2000162849,bankTransfer_DE,2021-01-05 22:47:33,CET,Settled,6119097984495277,USD,,535.85,1,USD,,535.65,0.2,,,,bankTransfer_DE,380,,,,,,,,CM2000162849,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1519098833255984,CM7000054339,cartebancaire,2021-01-05 22:50:00,CET,Settled,2319098833417964,USD,,49.85,1,USD,,49.44,,0.3,0.01,0.1,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1316098837274028,CM7000054340,cartebancaire,2021-01-05 22:57:54,CET,Settled,7416098837989761,USD,,548.85,1,USD,,544.45,,3.29,0.01,1.1,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1719098838185283,CM7000054341,cartebancaire,2021-01-05 22:58:55,CET,Settled,2319098838335674,USD,,49.9,1,USD,,49.49,,0.3,0.01,0.1,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1319098839578639,CM1000028898,ideal,2021-01-05 22:59:38,CET,Settled,1319098839578639,USD,,21.5,1,USD,,21.25,0.25,,,,idealing,380,,,,,,,,CM1000028898,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1719098840081330,CM7000054342,cartebancaire,2021-01-05 23:02:06,CET,Settled,7419098840236918,USD,,29.9,1,USD,,29.65,,0.18,0.01,0.06,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1319098843583005,CM7000054343,cartebancaire,2021-01-05 23:08:26,CET,Settled,2316098844388595,USD,,79.85,1,USD,,79.12,,0.48,0.01,0.24,cartebancaire,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,1729098847315127,CM2000162952,mc,2021-01-05 23:13:50,CET,Settled,7426098848302184,USD,,469.9,1,USD,,465.7,,2.44,0.82,0.94,mcstandarddebit,380,,,,,,,,,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,4716098852529991,CM3000151494,directEbanking,2021-01-05 23:22:58,CET,Settled,4716098852529991,USD,,445.9,1,USD,,441.44,4.46,,,,directEbanking,380,,,,,,,,CM3000151494,2021-01-06 23:50:00,CET +CompanyNL,YOURCOMPANY_ACCOUNT,,,,2021-01-07 00:46:38,CET,Fee,Transaction Fees January 05 2021,,,,,USD,38.1,,,,,,,380,,,,,,,,,2021-01-07 00:46:38,CET +CompanyNL,YOURCOMPANY_ACCOUNT,,,,2021-01-07 00:46:38,CET,MerchantPayout,"TX635094301XT batch 380, YOURCOMPANY_ACCOUNT",,,,,USD,55308.07,,,,,,,380,,,,,,,,,2021-01-07 00:46:38,CET diff --git a/account_bank_statement_import_adyen/tests/__init__.py b/account_bank_statement_import_adyen/tests/__init__.py new file mode 100644 index 00000000..f53fb980 --- /dev/null +++ b/account_bank_statement_import_adyen/tests/__init__.py @@ -0,0 +1 @@ +from . import test_import_adyen diff --git a/account_bank_statement_import_adyen/tests/test_import_adyen.py b/account_bank_statement_import_adyen/tests/test_import_adyen.py new file mode 100644 index 00000000..ed6e57b8 --- /dev/null +++ b/account_bank_statement_import_adyen/tests/test_import_adyen.py @@ -0,0 +1,116 @@ +# Copyright 2017 Opener BV +# Copyright 2020 Vanmoof BV +# Copyright 2015-2022 Therp BV ) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +"""Run test imports of Adyen files.""" +import base64 + +from odoo.exceptions import UserError +from odoo.modules.module import get_module_resource +from odoo.tests.common import SavepointCase + + +class TestImportAdyen(SavepointCase): + """Run test imports of Adyen files.""" + + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.journal = cls.env["account.journal"].create( + { + "company_id": cls.env.user.company_id.id, + "name": "Adyen test", + "code": "ADY", + "type": "bank", + "adyen_merchant_account": "YOURCOMPANY_ACCOUNT", + "currency_id": cls.env.ref("base.USD").id, + } + ) + + def test_01_import_adyen(self): + """ Test that the Adyen statement can be imported and that the + lines on the default journal (clearing) account are fully reconciled + with each other """ + self._test_statement_import( + "adyen_test.xlsx", "YOURCOMPANY_ACCOUNT 2016/48", + ) + statement = self.env["account.bank.statement"].search( + [], order="create_date desc", limit=1 + ) + self.assertEqual(statement.journal_id, self.journal) + self.assertEqual(len(statement.line_ids), 22) + self.assertTrue( + self.env.user.company_id.currency_id.is_zero( + sum(line.amount for line in statement.line_ids) + ) + ) + + def test_02_import_adyen_credit_fees(self): + """ Import an Adyen statement with credit fees """ + self._test_statement_import( + "adyen_test_credit_fees.xlsx", "YOURCOMPANY_ACCOUNT 2016/8", + ) + + def test_03_import_adyen_invalid(self): + """ Trying to hit that coverall target """ + with self.assertRaisesRegex(UserError, "not a Adyen settlement details file"): + self._test_statement_import( + "adyen_test_invalid.xls", "invalid", + ) + + def test_04_import_adyen_csv(self): + """ Test that the Adyen statement can be imported in csv format.""" + self._test_statement_import( + "settlement_detail_report_batch_380.csv", "YOURCOMPANY_ACCOUNT 2021/380", + ) + statement = self.env["account.bank.statement"].search( + [], order="create_date desc", limit=1 + ) + self.assertEqual(statement.journal_id, self.journal) + # Csv lines has 229 lines. Minus 1 header. Plus 1 extra transaction line. + self.assertEqual(len(statement.line_ids), 229) + self.assertTrue( + self.env.user.company_id.currency_id.is_zero( + sum(line.amount for line in statement.line_ids) + ) + ) + + def test_05_import_adyen_csv(self): + """ Test that the Adyen statement without Merchant Payoutcan be imported.""" + self._test_statement_import( + "settlement_detail_report_batch_238.csv", "YOURCOMPANY_ACCOUNT 2022/238", + ) + statement = self.env["account.bank.statement"].search( + [], order="create_date desc", limit=1 + ) + self.assertEqual(statement.journal_id, self.journal) + # Csv lines has 4 lines. Minus 1 header. No extra transaction line. + self.assertEqual(len(statement.line_ids), 3) + self.assertTrue( + self.env.user.company_id.currency_id.is_zero( + sum(line.amount for line in statement.line_ids) + ) + ) + + def _test_statement_import(self, file_name, statement_name): + """Test correct creation of single statement.""" + testfile = get_module_resource( + "account_bank_statement_import_adyen", "test_files", file_name + ) + with open(testfile, "rb") as datafile: + data_file = base64.b64encode(datafile.read()) + import_wizard = self.env["account.bank.statement.import"].create( + {"attachment_ids": [(0, 0, {"name": file_name, "datas": data_file})]} + ) + import_wizard.with_context( + { + "account_bank_statement_import_adyen": True, + "journal_id": self.journal.id, + } + ).import_file() + # statement name is account number + '-' + date of last line. + statements = self.env["account.bank.statement"].search( + [("name", "=", statement_name)] + ) + self.assertTrue(statements) + return statements diff --git a/account_bank_statement_import_adyen/views/account_journal.xml b/account_bank_statement_import_adyen/views/account_journal.xml new file mode 100644 index 00000000..bf845158 --- /dev/null +++ b/account_bank_statement_import_adyen/views/account_journal.xml @@ -0,0 +1,13 @@ + + + + Add Adyen merchant account + account.journal + + + + + + + + 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..97d3467d --- /dev/null +++ b/account_bank_statement_import_online_adyen/models/online_bank_statement_provider.py @@ -0,0 +1,124 @@ +# Copyright 2021 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +# pylint: disable=missing-docstring,invalid-name,protected-access +import base64 +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: + is_scheduled = self.env.context.get("scheduled") + try: + self._import_adyen_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 _import_adyen_file(self): + """Import Adyen file using functionality from manual Adyen import module.""" + self.ensure_one() + content, attachment_vals = self._get_attachment_vals() + wizard = ( + self.env["account.bank.statement.import"] + .with_context({"journal_id": self.journal_id.id}) + .create({"attachment_ids": [(0, 0, attachment_vals)]}) + ) + currency_code, account_number, stmts_vals = wizard._parse_adyen_file(content) + wizard._check_parsed_data(stmts_vals, account_number) + _currency, journal = wizard._find_additional_data(currency_code, account_number) + stmts_vals = wizard._complete_stmts_vals(stmts_vals, journal, account_number) + wizard._create_bank_statements(stmts_vals) + + def _get_attachment_vals(self): + """Retrieve settlement details and convert to attachment vals.""" + content, filename = self._adyen_get_settlement_details_file() + encoded_content = base64.encodebytes(content) + # Make sure base64 encoded content contains multiple of 4 bytes. + byte_count = len(encoded_content) + byte_padding = b"=" * (byte_count % 4) + data_file = encoded_content + byte_padding + attachment_vals = {"name": filename, "datas": data_file} + return content, attachment_vals + + 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 + filename = self.download_file_name % batch_number + URL = "/".join( + [self.api_base, self.journal_id.adyen_merchant_account, filename] + ) + response = requests.get(URL, auth=(self.username, self.password)) + if response.status_code != 200: + raise UserError(_("%s \n\n %s") % (response.status_code, response.text)) + _logger.debug(_("Headers returned by Adyen %s"), response.headers) + byte_count = len(response.content) + _logger.debug( + _("Retrieved %d bytes from Adyen, starting with %s"), + byte_count, + response.content[:64], + ) + return response.content, filename + + 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 00000000..716dbd37 Binary files /dev/null and b/account_bank_statement_import_online_adyen/static/description/icon.png differ 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. +
  3. Open bank account to configure and edit it
  4. +
  5. Set Bank Feeds to Online
  6. +
  7. Select Adyen as online bank statements provider in +Online Bank Statements (OCA) section
  8. +
  9. Save the bank account
  10. +
  11. Click on provider and configure provider-specific settings.
  12. +
+

or, alternatively:

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

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. +
  3. Select specific bank accounts
  4. +
  5. Launch Actions > Online Bank Statements Pull Wizard
  6. +
  7. Configure date interval and click Pull
  8. +
+

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..9b028cb4 --- /dev/null +++ b/account_bank_statement_import_online_adyen/tests/online_bank_statement_provider_dummy.py @@ -0,0 +1,24 @@ +# Copyright 2021-2022 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +"""Dummy provider gets files from file-system, instead of from api.""" +from odoo import models +from odoo.modules.module import get_module_resource + + +class OnlineBankStatementProviderDummy(models.Model): + """Dummy provider gets files from file-system, instead of from api.""" + + _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() + filename = self.download_file_name + testfile = get_module_resource( + "account_bank_statement_import_adyen", "test_files", filename + ) + with open(testfile, "rb") as datafile: + data_file = datafile.read() + return data_file, filename 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..64d42de4 --- /dev/null +++ b/account_bank_statement_import_online_adyen/tests/test_import_online.py @@ -0,0 +1,71 @@ +# Copyright 2021-2022 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +"""Test online Adyen reusing tests for manual import.""" +from dateutil.relativedelta import relativedelta + +from odoo import fields + +# pylint: disable=import-error +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): + """Setup online journal.""" + # pylint: disable=invalid-name + 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) + # pylint: disable=protected-access + 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 + + + + + + + + + + + + + + diff --git a/account_bank_statement_import_paypal/models/account_bank_statement_import_paypal_parser.py b/account_bank_statement_import_paypal/models/account_bank_statement_import_paypal_parser.py index 2a6f323d..791fda95 100644 --- a/account_bank_statement_import_paypal/models/account_bank_statement_import_paypal_parser.py +++ b/account_bank_statement_import_paypal/models/account_bank_statement_import_paypal_parser.py @@ -5,6 +5,7 @@ import itertools import logging +from csv import reader from datetime import datetime from decimal import Decimal from io import StringIO @@ -16,11 +17,6 @@ from odoo import _, api, models _logger = logging.getLogger(__name__) -try: - from csv import reader -except (ImportError, IOError) as err: - _logger.error(err) - class AccountBankStatementImportPayPalParser(models.TransientModel): _name = "account.bank.statement.import.paypal.parser" @@ -110,6 +106,8 @@ class AccountBankStatementImportPayPalParser(models.TransientModel): header = list(next(csv_data)) data_dict = self._data_dict_constructor(mapping, header) + if data_dict.get("currency_column") is None: + raise ValueError(_("No currency column, not a valid Paypal file")) return self._calculate_lines(csv_data, data_dict, mapping, currency_code) diff --git a/account_bank_statement_import_transfer_move/models/account_bank_statement_import.py b/account_bank_statement_import_transfer_move/models/account_bank_statement_import.py index af145c46..e2ae6739 100644 --- a/account_bank_statement_import_transfer_move/models/account_bank_statement_import.py +++ b/account_bank_statement_import_transfer_move/models/account_bank_statement_import.py @@ -1,13 +1,44 @@ # Copyright 2020 Camptocamp SA # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import models +from odoo import api, models class AccountBankStatementImport(models.TransientModel): _inherit = "account.bank.statement.import" + @api.model + def _parse_file(self, data_file): + """Enable testing of this functionality.""" + if self.env.context.get("account_bank_statement_import_transfer_move", False): + return ( + None, + "NL77ABNA0574908765", + [ + { + "balance_end_real": 15121.12, + "balance_start": 15568.27, + "date": "2014-01-05", + "name": "1234Test/1", + "transactions": [ + { + "account_number": "NL46ABNA0499998748", + "amount": -754.25, + "date": "2014-01-05", + "name": "Insurance policy 857239PERIOD 01.01.2014 - " + "31.12.2014", + "note": "MKB Insurance 859239PERIOD 01.01.2014 - " + "31.12.2014", + "partner_name": "INSURANCE COMPANY TESTX", + "ref": "435005714488-ABNO33052620", + }, + ], + } + ], + ) + return super()._parse_file(data_file) + def _create_bank_statements(self, stmts_vals): """ Create additional line in statement to set bank statement statement to 0 balance""" diff --git a/account_bank_statement_import_transfer_move/models/account_journal.py b/account_bank_statement_import_transfer_move/models/account_journal.py index 6bd9612a..92bcd270 100644 --- a/account_bank_statement_import_transfer_move/models/account_journal.py +++ b/account_bank_statement_import_transfer_move/models/account_journal.py @@ -4,7 +4,7 @@ from odoo import fields, models -class AccountBankStatementImport(models.Model): +class AccountJournal(models.Model): _inherit = "account.journal" diff --git a/account_bank_statement_import_transfer_move/tests/test_statement.py b/account_bank_statement_import_transfer_move/tests/test_statement.py index e81b7856..1c6ba3d8 100644 --- a/account_bank_statement_import_transfer_move/tests/test_statement.py +++ b/account_bank_statement_import_transfer_move/tests/test_statement.py @@ -1,8 +1,6 @@ # Copyright 2020 Camptocamp SA # Copyright 2020 Tecnativa - Pedro M. Baeza -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from unittest.mock import patch - +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo.tests.common import SavepointCase @@ -35,60 +33,19 @@ class TestGenerateBankStatement(SavepointCase): } ) - def _parse_file(self, data_file): - """Fake method for returning valuable data. Extracted from CAMT demo""" - return ( - None, - "NL77ABNA0574908765", - [ - { - "balance_end_real": 15121.12, - "balance_start": 15568.27, - "date": "2014-01-05", - "name": "1234Test/1", - "transactions": [ - { - "account_number": "NL46ABNA0499998748", - "amount": -754.25, - "date": "2014-01-05", - "name": "Insurance policy 857239PERIOD 01.01.2014 - " - "31.12.2014", - "note": "MKB Insurance 859239PERIOD 01.01.2014 - " - "31.12.2014", - "partner_name": "INSURANCE COMPANY TESTX", - "ref": "435005714488-ABNO33052620", - }, - ], - } - ], - ) - - def _get_bank_statements_available_import_formats(self): - """Fake method for returning a fake importer for not having errors.""" - return ["test"] - def _load_statement(self): - module = "odoo.addons.account_bank_statement_import" - with patch( - module - + ".account_journal.AccountJournal" - + "._get_bank_statements_available_import_formats", - self._get_bank_statements_available_import_formats, - ): - with patch( - module - + ".account_bank_statement_import" - + ".AccountBankStatementImport._parse_file", - self._parse_file, - ): - self.env["account.bank.statement.import"].create( - {"attachment_ids": [(0, 0, {"name": "test file", "datas": b""})]} - ).import_file() - bank_st_record = self.env["account.bank.statement"].search( - [("name", "=", "1234Test/1")], limit=1 - ) - statement_lines = bank_st_record.line_ids - return statement_lines + """Load fake statements, to test creation of extra line.""" + absi = self.env["account.bank.statement.import"].create( + {"attachment_ids": [(0, 0, {"name": "test file", "datas": b""})]} + ) + absi.with_context( + {"account_bank_statement_import_transfer_move": True} + ).import_file() + bank_st_record = self.env["account.bank.statement"].search( + [("name", "=", "1234Test/1")], limit=1 + ) + statement_lines = bank_st_record.line_ids + return statement_lines def test_statement_import(self): self.journal.transfer_line = True diff --git a/setup/account_bank_statement_clearing_account/odoo/addons/account_bank_statement_clearing_account b/setup/account_bank_statement_clearing_account/odoo/addons/account_bank_statement_clearing_account new file mode 120000 index 00000000..4ae7bb48 --- /dev/null +++ b/setup/account_bank_statement_clearing_account/odoo/addons/account_bank_statement_clearing_account @@ -0,0 +1 @@ +../../../../account_bank_statement_clearing_account \ No newline at end of file diff --git a/setup/account_bank_statement_clearing_account/setup.py b/setup/account_bank_statement_clearing_account/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_bank_statement_clearing_account/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) 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 new file mode 120000 index 00000000..2e39464e --- /dev/null +++ b/setup/account_bank_statement_import_adyen/odoo/addons/account_bank_statement_import_adyen @@ -0,0 +1 @@ +../../../../account_bank_statement_import_adyen \ No newline at end of file diff --git a/setup/account_bank_statement_import_adyen/setup.py b/setup/account_bank_statement_import_adyen/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_bank_statement_import_adyen/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/account_bank_statement_import_online_adyen/odoo/addons/account_bank_statement_import_online_adyen b/setup/account_bank_statement_import_online_adyen/odoo/addons/account_bank_statement_import_online_adyen new file mode 120000 index 00000000..fa446601 --- /dev/null +++ b/setup/account_bank_statement_import_online_adyen/odoo/addons/account_bank_statement_import_online_adyen @@ -0,0 +1 @@ +../../../../account_bank_statement_import_online_adyen \ No newline at end of file diff --git a/setup/account_bank_statement_import_online_adyen/setup.py b/setup/account_bank_statement_import_online_adyen/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_bank_statement_import_online_adyen/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)