From dba95fb13f3dc23a10fe6863474881723a66d718 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sun, 10 Apr 2022 15:56:13 +0200 Subject: [PATCH] [IMP] account_bank_statement_import_online_qonto: black, isort, prettier --- .../__manifest__.py | 4 +- .../online_bank_statement_provider_qonto.py | 143 +++++++------- ...ount_bank_statement_import_online_qonto.py | 178 +++++++++--------- .../view/online_bank_statement_provider.xml | 9 +- ...account_bank_statement_import_online_qonto | 1 + .../setup.py | 6 + 6 files changed, 182 insertions(+), 159 deletions(-) create mode 120000 setup/account_bank_statement_import_online_qonto/odoo/addons/account_bank_statement_import_online_qonto create mode 100644 setup/account_bank_statement_import_online_qonto/setup.py diff --git a/account_bank_statement_import_online_qonto/__manifest__.py b/account_bank_statement_import_online_qonto/__manifest__.py index dfbc1d01..3f532eea 100644 --- a/account_bank_statement_import_online_qonto/__manifest__.py +++ b/account_bank_statement_import_online_qonto/__manifest__.py @@ -8,7 +8,5 @@ "license": "AGPL-3", "installable": True, "depends": ["account_bank_statement_import_online"], - "data": [ - "view/online_bank_statement_provider.xml" - ], + "data": ["view/online_bank_statement_provider.xml"], } diff --git a/account_bank_statement_import_online_qonto/models/online_bank_statement_provider_qonto.py b/account_bank_statement_import_online_qonto/models/online_bank_statement_provider_qonto.py index e421fc77..bad99979 100644 --- a/account_bank_statement_import_online_qonto/models/online_bank_statement_provider_qonto.py +++ b/account_bank_statement_import_online_qonto/models/online_bank_statement_provider_qonto.py @@ -1,43 +1,39 @@ # Copyright 2020 Florent de Labarre # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -import requests import json from datetime import datetime -import pytz -from odoo import api, models, _ +import pytz +import requests + +from odoo import _, api, models from odoo.exceptions import UserError + from odoo.addons.base.models.res_bank import sanitize_account_number -QONTO_ENDPOINT = 'https://thirdparty.qonto.eu/v2' +QONTO_ENDPOINT = "https://thirdparty.qonto.eu/v2" class OnlineBankStatementProviderQonto(models.Model): - _inherit = 'online.bank.statement.provider' + _inherit = "online.bank.statement.provider" @api.model def _get_available_services(self): return super()._get_available_services() + [ - ('qonto', 'Qonto.eu'), + ("qonto", "Qonto.eu"), ] def _obtain_statement_data(self, date_since, date_until): self.ensure_one() - if self.service != 'qonto': - return super()._obtain_statement_data( - date_since, - date_until, - ) + if self.service != "qonto": + return super()._obtain_statement_data(date_since, date_until,) return self._qonto_obtain_statement_data(date_since, date_until) def _get_statement_date(self, date_since, date_until): self.ensure_one() - if self.service != 'qonto': - return super()._get_statement_date( - date_since, - date_until, - ) - return date_since.astimezone(pytz.timezone('Europe/Paris')).date() + if self.service != "qonto": + return super()._get_statement_date(date_since, date_until,) + return date_since.astimezone(pytz.timezone("Europe/Paris")).date() ######### # qonto # @@ -46,85 +42,94 @@ class OnlineBankStatementProviderQonto(models.Model): def _qonto_header(self): self.ensure_one() if self.username and self.password: - return {'Authorization': '%s:%s' % (self.username, self.password)} - raise UserError(_('Please fill login and key')) + return {"Authorization": "{}:{}".format(self.username, self.password)} + raise UserError(_("Please fill login and key")) def _qonto_get_slug(self): self.ensure_one() - url = QONTO_ENDPOINT + '/organizations/%7Bid%7D' + url = QONTO_ENDPOINT + "/organizations/%7Bid%7D" response = requests.get(url, verify=False, headers=self._qonto_header()) if response.status_code == 200: data = json.loads(response.text) res = {} - for account in data.get('organization', {}).get('bank_accounts', []): - iban = sanitize_account_number(account.get('iban', '')) - res[iban] = account.get('slug') + for account in data.get("organization", {}).get("bank_accounts", []): + iban = sanitize_account_number(account.get("iban", "")) + res[iban] = account.get("slug") return res - raise UserError(_('%s \n\n %s') % (response.status_code, response.text)) + raise UserError(_("%s \n\n %s") % (response.status_code, response.text)) def _qonto_obtain_transactions(self, slug, date_since, date_until): self.ensure_one() - url = QONTO_ENDPOINT + '/transactions' - params = {'slug': slug, 'iban': self.account_number} + url = QONTO_ENDPOINT + "/transactions" + params = {"slug": slug, "iban": self.account_number} if date_since: - params['settled_at_from'] = date_since.replace( - microsecond=0).isoformat() + 'Z' + params["settled_at_from"] = ( + date_since.replace(microsecond=0).isoformat() + "Z" + ) if date_until: - params['settled_at_to'] = date_until.replace( - microsecond=0).isoformat() + 'Z' + params["settled_at_to"] = ( + date_until.replace(microsecond=0).isoformat() + "Z" + ) transactions = [] current_page = 1 total_pages = 1 while current_page <= total_pages: - params['current_page'] = current_page + params["current_page"] = current_page data = self._qonto_get_transactions(url, params) - transactions.extend(data.get('transactions', [])) - total_pages = data['meta']['total_pages'] + transactions.extend(data.get("transactions", [])) + total_pages = data["meta"]["total_pages"] current_page += 1 return transactions def _qonto_get_transactions(self, url, params): - response = requests.get(url, verify=False, params=params, - headers=self._qonto_header()) + response = requests.get( + url, verify=False, params=params, headers=self._qonto_header() + ) if response.status_code == 200: return json.loads(response.text) - raise UserError(_('%s \n\n %s') % (response.status_code, response.text)) + raise UserError(_("%s \n\n %s") % (response.status_code, response.text)) def _qonto_prepare_statement_line( - self, transaction, sequence, journal_currency, currencies_code2id): - date = datetime.strptime(transaction['settled_at'], '%Y-%m-%dT%H:%M:%S.%fZ') - side = 1 if transaction['side'] == 'credit' else -1 - name = transaction['label'] or '/' - if transaction['reference']: - name = '%s %s' % (name, transaction['reference']) + self, transaction, sequence, journal_currency, currencies_code2id + ): + date = datetime.strptime(transaction["settled_at"], "%Y-%m-%dT%H:%M:%S.%fZ") + side = 1 if transaction["side"] == "credit" else -1 + name = transaction["label"] or "/" + if transaction["reference"]: + name = "{} {}".format(name, transaction["reference"]) vals_line = { - 'sequence': sequence, - 'date': date, - 'name': name, - 'ref': transaction['reference'], - 'unique_import_id': transaction['transaction_id'], - 'amount': transaction['amount'] * side, + "sequence": sequence, + "date": date, + "name": name, + "ref": transaction["reference"], + "unique_import_id": transaction["transaction_id"], + "amount": transaction["amount"] * side, } - if not transaction['local_currency']: - raise UserError(_( - "Transaction ID %s has not local_currency. " - "This should never happen.") % transaction['transaction_id']) - if transaction['local_currency'] not in currencies_code2id: - raise UserError(_( - "Currency %s used in transaction ID %s doesn't exist " - "in Odoo.") % ( - transaction['local_currency'], - transaction['transaction_id'])) + if not transaction["local_currency"]: + raise UserError( + _( + "Transaction ID %s has not local_currency. " + "This should never happen." + ) + % transaction["transaction_id"] + ) + if transaction["local_currency"] not in currencies_code2id: + raise UserError( + _("Currency %s used in transaction ID %s doesn't exist " "in Odoo.") + % (transaction["local_currency"], transaction["transaction_id"]) + ) - line_currency_id = currencies_code2id[transaction['local_currency']] + line_currency_id = currencies_code2id[transaction["local_currency"]] if journal_currency.id != line_currency_id: - vals_line.update({ - 'currency_id': line_currency_id, - 'amount_currency': transaction['local_amount'] * side, - }) + vals_line.update( + { + "currency_id": line_currency_id, + "amount_currency": transaction["local_amount"] * side, + } + ) return vals_line def _qonto_obtain_statement_data(self, date_since, date_until): @@ -135,21 +140,23 @@ class OnlineBankStatementProviderQonto(models.Model): slug = slugs.get(self.account_number) if not slug: raise UserError( - _('Qonto : wrong configuration, unknow account %s') - % journal.bank_account_id.acc_number) + _("Qonto : wrong configuration, unknow account %s") + % journal.bank_account_id.acc_number + ) transactions = self._qonto_obtain_transactions(slug, date_since, date_until) journal_currency = journal.currency_id or journal.company_id.currency_id - all_currencies = self.env['res.currency'].search_read([], ['name']) - currencies_code2id = dict([(x['name'], x['id']) for x in all_currencies]) + all_currencies = self.env["res.currency"].search_read([], ["name"]) + currencies_code2id = {x["name"]: x["id"] for x in all_currencies} new_transactions = [] sequence = 0 for transaction in transactions: sequence += 1 vals_line = self._qonto_prepare_statement_line( - transaction, sequence, journal_currency, currencies_code2id) + transaction, sequence, journal_currency, currencies_code2id + ) new_transactions.append(vals_line) if new_transactions: diff --git a/account_bank_statement_import_online_qonto/tests/test_account_bank_statement_import_online_qonto.py b/account_bank_statement_import_online_qonto/tests/test_account_bank_statement_import_online_qonto.py index 98b38560..e5c5209e 100644 --- a/account_bank_statement_import_online_qonto/tests/test_account_bank_statement_import_online_qonto.py +++ b/account_bank_statement_import_online_qonto/tests/test_account_bank_statement_import_online_qonto.py @@ -7,114 +7,122 @@ from unittest import mock from odoo import fields from odoo.tests import common -_module_ns = 'odoo.addons.account_bank_statement_import_online_qonto' +_module_ns = "odoo.addons.account_bank_statement_import_online_qonto" _provider_class = ( _module_ns - + '.models.online_bank_statement_provider_qonto' - + '.OnlineBankStatementProviderQonto' + + ".models.online_bank_statement_provider_qonto" + + ".OnlineBankStatementProviderQonto" ) -class TestAccountBankAccountStatementImportOnlineQonto( - common.TransactionCase -): - +class TestAccountBankAccountStatementImportOnlineQonto(common.TransactionCase): def setUp(self): super().setUp() self.now = fields.Datetime.now() - self.currency_eur = self.env.ref('base.EUR') - self.currency_usd = self.env.ref('base.USD') - self.AccountJournal = self.env['account.journal'] - self.ResPartnerBank = self.env['res.partner.bank'] - self.OnlineBankStatementProvider = self.env[ - 'online.bank.statement.provider' - ] - self.AccountBankStatement = self.env['account.bank.statement'] - self.AccountBankStatementLine = self.env['account.bank.statement.line'] + self.currency_eur = self.env.ref("base.EUR") + self.currency_usd = self.env.ref("base.USD") + self.AccountJournal = self.env["account.journal"] + self.ResPartnerBank = self.env["res.partner.bank"] + self.OnlineBankStatementProvider = self.env["online.bank.statement.provider"] + self.AccountBankStatement = self.env["account.bank.statement"] + self.AccountBankStatementLine = self.env["account.bank.statement.line"] self.bank_account = self.ResPartnerBank.create( - {'acc_number': 'FR0214508000302245362775K46', - 'partner_id': self.env.user.company_id.partner_id.id}) - self.journal = self.AccountJournal.create({ - 'name': 'Bank', - 'type': 'bank', - 'code': 'BANK', - 'currency_id': self.currency_eur.id, - 'bank_statements_source': 'online', - 'online_bank_statement_provider': 'qonto', - 'bank_account_id': self.bank_account.id, - }) + { + "acc_number": "FR0214508000302245362775K46", + "partner_id": self.env.user.company_id.partner_id.id, + } + ) + self.journal = self.AccountJournal.create( + { + "name": "Bank", + "type": "bank", + "code": "BANK", + "currency_id": self.currency_eur.id, + "bank_statements_source": "online", + "online_bank_statement_provider": "qonto", + "bank_account_id": self.bank_account.id, + } + ) self.provider = self.journal.online_bank_statement_provider_id self.mock_slug = lambda: mock.patch( - _provider_class + '._qonto_get_slug', - return_value={'FR0214508000302245362775K46': 'qonto-1234-bank-account-1'}, + _provider_class + "._qonto_get_slug", + return_value={"FR0214508000302245362775K46": "qonto-1234-bank-account-1"}, ) self.mock_transaction = lambda: mock.patch( - _provider_class + '._qonto_get_transactions', + _provider_class + "._qonto_get_transactions", return_value={ "transactions": [ - {"transaction_id": "qonto-1234-1-transaction-3", - "amount": 1200.0, - "amount_cents": 120000, - "attachment_ids": [], - "local_amount": 1200.0, - "local_amount_cents": 120000, - "side": "credit", - "operation_type": "income", - "currency": "EUR", - "local_currency": "EUR", - "label": "INVOICE A", - "settled_at": "2020-04-16T07:01:55.503Z", - "emitted_at": "2020-04-16T05:01:55.000Z", - "updated_at": "2020-04-16T07:04:02.792Z", - "status": "completed", - "note": None, - "reference": "Ref 1233", - "vat_amount": None, - "vat_amount_cents": None, - "vat_rate": None, - "initiator_id": None, - "label_ids": [], - "attachment_lost": False, - "attachment_required": True}, - {"transaction_id": "qonto-1234-1-transaction-2", - "amount": 1128.36, "amount_cents": 112836, - "attachment_ids": [], - "local_amount": 1128.36, - "local_amount_cents": 112836, - "side": "debit", - "operation_type": "transfer", - "currency": "EUR", - "local_currency": "EUR", - "label": "BILL A", - "settled_at": "2020-04-16T07:00:30.979Z", - "emitted_at": "2020-04-15T18:22:30.296Z", - "updated_at": "2020-04-16T07:03:01.125Z", - "status": "completed", - "note": None, - "reference": "Invoice", - "vat_amount": None, - "vat_amount_cents": None, - "vat_rate": None, - "initiator_id": "9b783957-85a6-404a-8320-a298781cb5fa", - "label_ids": [], - "attachment_lost": False, - "attachment_required": True}], - "meta": {"current_page": 1, - "next_page": None, - "prev_page": None, - "total_pages": 1, - "total_count": 2, - "per_page": 100}}, + { + "transaction_id": "qonto-1234-1-transaction-3", + "amount": 1200.0, + "amount_cents": 120000, + "attachment_ids": [], + "local_amount": 1200.0, + "local_amount_cents": 120000, + "side": "credit", + "operation_type": "income", + "currency": "EUR", + "local_currency": "EUR", + "label": "INVOICE A", + "settled_at": "2020-04-16T07:01:55.503Z", + "emitted_at": "2020-04-16T05:01:55.000Z", + "updated_at": "2020-04-16T07:04:02.792Z", + "status": "completed", + "note": None, + "reference": "Ref 1233", + "vat_amount": None, + "vat_amount_cents": None, + "vat_rate": None, + "initiator_id": None, + "label_ids": [], + "attachment_lost": False, + "attachment_required": True, + }, + { + "transaction_id": "qonto-1234-1-transaction-2", + "amount": 1128.36, + "amount_cents": 112836, + "attachment_ids": [], + "local_amount": 1128.36, + "local_amount_cents": 112836, + "side": "debit", + "operation_type": "transfer", + "currency": "EUR", + "local_currency": "EUR", + "label": "BILL A", + "settled_at": "2020-04-16T07:00:30.979Z", + "emitted_at": "2020-04-15T18:22:30.296Z", + "updated_at": "2020-04-16T07:03:01.125Z", + "status": "completed", + "note": None, + "reference": "Invoice", + "vat_amount": None, + "vat_amount_cents": None, + "vat_rate": None, + "initiator_id": "9b783957-85a6-404a-8320-a298781cb5fa", + "label_ids": [], + "attachment_lost": False, + "attachment_required": True, + }, + ], + "meta": { + "current_page": 1, + "next_page": None, + "prev_page": None, + "total_pages": 1, + "total_count": 2, + "per_page": 100, + }, + }, ) def test_qonto(self): with self.mock_transaction(), self.mock_slug(): lines, statement_values = self.provider._obtain_statement_data( - datetime(2020, 4, 15), - datetime(2020, 4, 17), + datetime(2020, 4, 15), datetime(2020, 4, 17), ) self.assertEqual(len(lines), 2) diff --git a/account_bank_statement_import_online_qonto/view/online_bank_statement_provider.xml b/account_bank_statement_import_online_qonto/view/online_bank_statement_provider.xml index 7bc06c91..0862a5af 100644 --- a/account_bank_statement_import_online_qonto/view/online_bank_statement_provider.xml +++ b/account_bank_statement_import_online_qonto/view/online_bank_statement_provider.xml @@ -3,12 +3,15 @@ online.bank.statement.provider.form online.bank.statement.provider - + - - + + diff --git a/setup/account_bank_statement_import_online_qonto/odoo/addons/account_bank_statement_import_online_qonto b/setup/account_bank_statement_import_online_qonto/odoo/addons/account_bank_statement_import_online_qonto new file mode 120000 index 00000000..7928bb92 --- /dev/null +++ b/setup/account_bank_statement_import_online_qonto/odoo/addons/account_bank_statement_import_online_qonto @@ -0,0 +1 @@ +../../../../account_bank_statement_import_online_qonto \ No newline at end of file diff --git a/setup/account_bank_statement_import_online_qonto/setup.py b/setup/account_bank_statement_import_online_qonto/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_bank_statement_import_online_qonto/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)