From f4449016e9499e1bd5aeedf3f1d7bd3329210a7b Mon Sep 17 00:00:00 2001 From: JasminSForgeFlow Date: Tue, 24 Jan 2023 14:31:22 +0530 Subject: [PATCH 01/17] [ADD] account_bank_statement_import_online_ofx --- .../README.rst | 110 ++++++++++++++ .../__init__.py | 4 + .../__manifest__.py | 20 +++ .../models/__init__.py | 4 + .../models/ofx_institution.py | 14 ++ .../online_bank_statement_provider_ofx.py | 140 ++++++++++++++++++ .../security/ir.model.access.csv | 5 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../views/online_bank_statement_provider.xml | 45 ++++++ .../wizards/__init__.py | 3 + .../online_bank_statement_pull_wizard.py | 32 ++++ .../online_bank_statement_pull_wizard.xml | 22 +++ 12 files changed, 399 insertions(+) create mode 100644 account_statement_import_online_ofx/README.rst create mode 100644 account_statement_import_online_ofx/__init__.py create mode 100644 account_statement_import_online_ofx/__manifest__.py create mode 100644 account_statement_import_online_ofx/models/__init__.py create mode 100644 account_statement_import_online_ofx/models/ofx_institution.py create mode 100644 account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py create mode 100644 account_statement_import_online_ofx/security/ir.model.access.csv create mode 100644 account_statement_import_online_ofx/static/description/icon.png create mode 100644 account_statement_import_online_ofx/views/online_bank_statement_provider.xml create mode 100644 account_statement_import_online_ofx/wizards/__init__.py create mode 100644 account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py create mode 100644 account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.xml diff --git a/account_statement_import_online_ofx/README.rst b/account_statement_import_online_ofx/README.rst new file mode 100644 index 000000000..efb2aa8d3 --- /dev/null +++ b/account_statement_import_online_ofx/README.rst @@ -0,0 +1,110 @@ +================================== +Online Bank Statements: OFX +================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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/14.0/account_statement_import_online_paypal + :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-14-0/bank-statement-import-14-0-account_statement_import_online_paypal + :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/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module provides online bank statements from OFX instutitons + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +To configure online bank statements provider: + +#. Go to *Invoicing > Configuration > Journals* +#. Open bank journal to configure and edit it +#. Set *Bank Feeds* to *Online* +#. Select *OFX* as online bank statements provider in + *Online Bank Statements (OCA)* section +#. Save the bank journal +#. Click on provider and configure provider-specific settings. + +Usage +===== + +To pull historical bank statements: + +#. Go to *Invoicing > Configuration > Journals* +#. Select specific bank accounts +#. Launch *Actions > Online Bank Statements Pull Wizard* +#. Configure date interval and click *Pull* + +Known issues / Roadmap +====================== + + +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 +~~~~~~~ + +* ForgeFlow + +Contributors +~~~~~~~~~~~~ + +* `ForgeFlow `__ + + * Jasmin Solanki + +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. + +.. |maintainer-alexey-pelykh| image:: https://github.com/alexey-pelykh.png?size=40px + :target: https://github.com/alexey-pelykh + :alt: alexey-pelykh + +Current `maintainer `__: + +|maintainer-alexey-pelykh| + +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_statement_import_online_ofx/__init__.py b/account_statement_import_online_ofx/__init__.py new file mode 100644 index 000000000..adc6207fd --- /dev/null +++ b/account_statement_import_online_ofx/__init__.py @@ -0,0 +1,4 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import models +from . import wizards diff --git a/account_statement_import_online_ofx/__manifest__.py b/account_statement_import_online_ofx/__manifest__.py new file mode 100644 index 000000000..b81154df1 --- /dev/null +++ b/account_statement_import_online_ofx/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2023 ForgeFlow S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +{ + "name": "Online Bank Statements: OFX", + "version": "14.0.1.0.0", + "author": "ForgeFlow, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/bank-statement-import", + "license": "AGPL-3", + "category": "Accounting", + "summary": "Online bank statements for OFX", + "depends": ["account_statement_import_online"], + "external_dependencies": {"python": ["ofxtools", "ofxparse"]}, + "data": [ + "security/ir.model.access.csv", + "views/online_bank_statement_provider.xml", + "wizards/online_bank_statement_pull_wizard.xml", + ], + "installable": True, +} diff --git a/account_statement_import_online_ofx/models/__init__.py b/account_statement_import_online_ofx/models/__init__.py new file mode 100644 index 000000000..88e0ba174 --- /dev/null +++ b/account_statement_import_online_ofx/models/__init__.py @@ -0,0 +1,4 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import ofx_institution +from . import online_bank_statement_provider_ofx diff --git a/account_statement_import_online_ofx/models/ofx_institution.py b/account_statement_import_online_ofx/models/ofx_institution.py new file mode 100644 index 000000000..f1feb0dcb --- /dev/null +++ b/account_statement_import_online_ofx/models/ofx_institution.py @@ -0,0 +1,14 @@ +# Copyright 2023 ForgeFlow S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + + +from odoo import fields, models + + +class OFXInstitution(models.Model): + _name = "ofx.institution" + _description = "OFX Institution" + + name = fields.Char() + nickname = fields.Char() + ofxhome_id = fields.Integer() diff --git a/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py b/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py new file mode 100644 index 000000000..5805aeb49 --- /dev/null +++ b/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py @@ -0,0 +1,140 @@ +# Copyright 2023 ForgeFlow S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +import io +import time +from datetime import datetime + +from ofxparse import OfxParser +from ofxtools import ofxhome, utils +from ofxtools.Client import OFXClient, StmtRq + +from odoo import _, api, fields, models +from odoo.exceptions import UserError + + +class OnlineBankStatementProviderOFX(models.Model): + _inherit = "online.bank.statement.provider" + + ofx_institution_line_ids = fields.One2many("ofx.institution.line", "provider_id") + + @api.model + def _get_available_services(self): + return super()._get_available_services() + [ + ("OFX", "OFX"), + ] + + def get_statements(self, client, password, s1, try_no=1): + statements = client.request_statements(password, s1, skip_profile=True) + file_data = statements.read() + if b"Request unsuccessful. Incapsula incident ID" in file_data and try_no <= 3: + time.sleep(3) + return self.get_statements(client, password, s1, try_no + 1) + ofx = OfxParser.parse(io.BytesIO(file_data)) + if ofx.status.get("code") != 0: + raise UserError(file_data) + return ofx + + def _obtain_statement_data(self, date_since, date_until): + self.ensure_one() + is_scheduled = self.env.context.get("scheduled") + # set date_until as today's date if its greter than today's date + # to avoid failure of request. + today = datetime.now() + today = today.replace(hour=0, minute=0, second=0, microsecond=0) + if date_until > today: + date_until = today + if self.service != "OFX": + return super()._obtain_statement_data( + date_since, + date_until, + ) # pragma: no cover + + lines = [] + if is_scheduled: + ofx_institution_lines = self.ofx_institution_line_ids + else: + ofx_institution_lines = self.env["ofx.institution.line"].browse( + self._context.get("ofx_institution_ids") + ) + for ofx_institution_line in ofx_institution_lines: + try: + username = ofx_institution_line.username + password = ofx_institution_line.password + bankid = ofx_institution_line.bankid + ofxhome_id = ofx_institution_line.institution_id.ofxhome_id + acctid = ofx_institution_line.account_id + + institute = ofxhome.lookup(ofxhome_id) + if institute is None or institute.url is None: + raise UserError(_("OFX Data is not available")) + ofxhome_id = institute.id + client = OFXClient( + institute.url, + userid=username, + org=institute.org, + fid=institute.fid, + bankid=bankid, + ) + dtstart = date_since.replace(tzinfo=utils.UTC) + dtend = date_until.replace(tzinfo=utils.UTC) + s1 = StmtRq( + acctid=acctid, + dtstart=dtstart, + dtend=dtend, + accttype="CHECKING", + ) + ofx = self.get_statements(client, password, s1) + for account in ofx.accounts: + if not account.statement.transactions: + continue + for transaction in account.statement.transactions: + vals = self._prepare_ofx_transaction_line(transaction) + if vals: + lines.append(vals) + except Exception as e: + raise UserError( + _("The following problem occurred during import.\n\n %s") % str(e) + ) + return lines, {} + + @api.model + def _prepare_ofx_transaction_line(self, transaction): + payment_ref = transaction.payee + if transaction.checknum: + payment_ref += " " + transaction.checknum + if transaction.memo: + payment_ref += " : " + transaction.memo + vals = { + "date": transaction.date, + "payment_ref": payment_ref, + "amount": float(transaction.amount), + "unique_import_id": transaction.id, + } + return vals + + def import_ofx_institutions(self): + OfxInstitution = self.env["ofx.institution"] + for ofxhome_id, name in ofxhome.list_institutions().items(): + institute = OfxInstitution.search([("ofxhome_id", "=", ofxhome_id)]) + vals = { + "name": name, + "ofxhome_id": ofxhome_id, + } + if institute: + institute.write(vals) + else: + OfxInstitution.create(vals) + + +class OFXInstitutionLine(models.Model): + _name = "ofx.institution.line" + _description = "OFX Institution Line" + _rec_name = "institution_id" + + institution_id = fields.Many2one("ofx.institution", "Institution") + username = fields.Char() + password = fields.Char() + bankid = fields.Char() + provider_id = fields.Many2one("online.bank.statement.provider") + account_id = fields.Char() diff --git a/account_statement_import_online_ofx/security/ir.model.access.csv b/account_statement_import_online_ofx/security/ir.model.access.csv new file mode 100644 index 000000000..aa84efa4d --- /dev/null +++ b/account_statement_import_online_ofx/security/ir.model.access.csv @@ -0,0 +1,5 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_ofx_institution_manager,ofx_institution,model_ofx_institution,account.group_account_user,1,1,1,1 +access_ofx_institution_user,ofx_institution,model_ofx_institution,base.group_user,1,0,0,0 +access_ofx_institution_line_user,access_ofx_institution_line,model_ofx_institution_line,base.group_user,1,0,0,0 +access_ofx_institution_line_manager,access_ofx_institution_line,model_ofx_institution_line,account.group_account_user,1,1,1,1 diff --git a/account_statement_import_online_ofx/static/description/icon.png b/account_statement_import_online_ofx/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_statement_import_online_ofx/views/online_bank_statement_provider.xml b/account_statement_import_online_ofx/views/online_bank_statement_provider.xml new file mode 100644 index 000000000..d3c9ed231 --- /dev/null +++ b/account_statement_import_online_ofx/views/online_bank_statement_provider.xml @@ -0,0 +1,45 @@ + + + + online.bank.statement.provider.form + online.bank.statement.provider + + + +
+
+ + + + + + + + + + + + + + + + + + + diff --git a/account_statement_import_online_ofx/wizards/__init__.py b/account_statement_import_online_ofx/wizards/__init__.py new file mode 100644 index 000000000..a8ac66266 --- /dev/null +++ b/account_statement_import_online_ofx/wizards/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import online_bank_statement_pull_wizard diff --git a/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py b/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py new file mode 100644 index 000000000..0c08874de --- /dev/null +++ b/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py @@ -0,0 +1,32 @@ +# Copyright 2023 ForgeFlow S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import api, fields, models + + +class OnlineBankStatementPullWizard(models.TransientModel): + _inherit = "online.bank.statement.pull.wizard" + + ofx_institution_ids = fields.Many2many( + string="OFX Institutions", + comodel_name="ofx.institution.line", + column1="wizard_id", + column2="institution_line_id", + relation="ofx_institution_line_pull_wizard_rel", + ) + is_ofx_provider = fields.Boolean() + + @api.onchange("provider_ids") + def onchange_provider_ids(self): + for rec in self: + rec.is_ofx_provider = False + for provider in rec.provider_ids: + if provider.service == "OFX": + rec.is_ofx_provider = True + break + + def action_pull(self): + return super( + OnlineBankStatementPullWizard, + self.with_context(ofx_institution_ids=self.ofx_institution_ids.ids), + ).action_pull() diff --git a/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.xml b/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.xml new file mode 100644 index 000000000..ade08671f --- /dev/null +++ b/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.xml @@ -0,0 +1,22 @@ + + + + online.bank.statement.pull.wizard.form + online.bank.statement.pull.wizard + + + + + + + + + From 6e1b366c6a04767c175c3de300b4f9a2a279865b Mon Sep 17 00:00:00 2001 From: JasminSForgeFlow Date: Thu, 23 Feb 2023 15:08:52 +0530 Subject: [PATCH 02/17] [IMP] account_bank_statement_import_online_ofx: Add Tests --- .../tests/__init__.py | 3 + ...est_account_statement_import_online_ofx.py | 101 ++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 account_statement_import_online_ofx/tests/__init__.py create mode 100644 account_statement_import_online_ofx/tests/test_account_statement_import_online_ofx.py diff --git a/account_statement_import_online_ofx/tests/__init__.py b/account_statement_import_online_ofx/tests/__init__.py new file mode 100644 index 000000000..249d8d9aa --- /dev/null +++ b/account_statement_import_online_ofx/tests/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import test_account_statement_import_online_ofx diff --git a/account_statement_import_online_ofx/tests/test_account_statement_import_online_ofx.py b/account_statement_import_online_ofx/tests/test_account_statement_import_online_ofx.py new file mode 100644 index 000000000..655a64733 --- /dev/null +++ b/account_statement_import_online_ofx/tests/test_account_statement_import_online_ofx.py @@ -0,0 +1,101 @@ +# Copyright 2023 ForgeFlow S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from datetime import datetime +from unittest import mock + +from dateutil.relativedelta import relativedelta + +from odoo import fields +from odoo.tests import common + +_module_ns = "odoo.addons.account_statement_import_online_ofx" +_provider_class = ( + _module_ns + + ".models.online_bank_statement_provider_ofx" + + ".OnlineBankStatementProviderOFX" +) + + +class TestAccountBankAccountStatementImportOnlineOFX(common.TransactionCase): + def setUp(self): + super().setUp() + + self.now = fields.Datetime.now() + self.today = datetime(self.now.year, self.now.month, self.now.day) + self.yesterday = self.today - relativedelta(days=1) + self.AccountJournal = self.env["account.journal"] + self.OnlineBankStatementProvider = self.env["online.bank.statement.provider"] + self.AccountBankStatement = self.env["account.bank.statement"] + self.AccountBankStatementLine = self.env["account.bank.statement.line"] + self.OfxInstitutionLine = self.env["ofx.institution.line"] + self.ofx_institute = self.env["ofx.institution"].create( + {"name": "Test", "nickname": "Test", "ofxhome_id": 1} + ) + + def test_import_online_ofx(self): + # Create bank journal + journal = self.AccountJournal.create( + { + "name": "Bank", + "type": "bank", + "code": "BANK", + "bank_statements_source": "online", + "online_bank_statement_provider": "OFX", + } + ) + provider = journal.online_bank_statement_provider_id + # Create OFX institution line in OFX provider + self.OfxInstitutionLine.create( + { + "institution_id": self.ofx_institute.id, + "username": "Test", + "password": "Test", + "bankid": "1234", + "provider_id": provider.id, + "account_id": "1234", + } + ) + + # import statement + + mocked_response = [ + { + "date": self.today, + "payment_ref": "BANKCARD 12345678", + "amount": 5645.07, + "unique_import_id": "202302211", + }, + { + "date": self.today, + "payment_ref": "ELECTRONIC IMAGE DEPOSIT", + "amount": 2874.91, + "unique_import_id": "202302212", + }, + { + "date": self.today, + "payment_ref": "BANKCARD 567890123", + "amount": 1269.18, + "unique_import_id": "202302213", + }, + ], {} + with mock.patch( + _provider_class + "._obtain_statement_data", + return_value=mocked_response, + ): + data = provider._obtain_statement_data( + self.yesterday, + self.today, + ) + + self.assertEqual(len(data[0]), 3) + self.assertEqual( + data[0][1], + { + "date": self.today, + "payment_ref": "ELECTRONIC IMAGE DEPOSIT", + "amount": 2874.91, + "unique_import_id": "202302212", + }, + ) + self.assertEqual(data[1], {}) From addd76414d276cdf0b2709851d0f2e1c4d3d5c01 Mon Sep 17 00:00:00 2001 From: JasminSForgeFlow Date: Thu, 23 Mar 2023 13:20:02 +0530 Subject: [PATCH 03/17] [IMP] account_statement_import_online_ofx: Change way to import institution list --- .../models/online_bank_statement_provider_ofx.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py b/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py index 5805aeb49..013606123 100644 --- a/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py +++ b/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py @@ -3,8 +3,10 @@ import io import time +import xml.etree.ElementTree as ET from datetime import datetime +import requests from ofxparse import OfxParser from ofxtools import ofxhome, utils from ofxtools.Client import OFXClient, StmtRq @@ -115,7 +117,16 @@ def _prepare_ofx_transaction_line(self, transaction): def import_ofx_institutions(self): OfxInstitution = self.env["ofx.institution"] - for ofxhome_id, name in ofxhome.list_institutions().items(): + try: + with requests.get("http://www.ofxhome.com/api.php?all=yes") as f: + response = f.text + institute_list = { + fi.get("id").strip(): fi.get("name").strip() + for fi in ET.fromstring(response) + } + except Exception as e: + raise UserError(_(e)) + for ofxhome_id, name in institute_list.items(): institute = OfxInstitution.search([("ofxhome_id", "=", ofxhome_id)]) vals = { "name": name, From 9d254bf6dc64e54a3d08436a0517ac566bb727d4 Mon Sep 17 00:00:00 2001 From: JasminSForgeFlow Date: Fri, 31 Mar 2023 14:47:28 +0530 Subject: [PATCH 04/17] [IMP] account_bank_statement_import_online_ofx: add filter on provider selection --- .../wizards/online_bank_statement_pull_wizard.py | 1 + 1 file changed, 1 insertion(+) diff --git a/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py b/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py index 0c08874de..3d0b8a189 100644 --- a/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py +++ b/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py @@ -13,6 +13,7 @@ class OnlineBankStatementPullWizard(models.TransientModel): column1="wizard_id", column2="institution_line_id", relation="ofx_institution_line_pull_wizard_rel", + domain="[('provider_id','in',provider_ids)]", ) is_ofx_provider = fields.Boolean() From 613b4c3c80d5b28cfe9b099339f59026b2edf9b0 Mon Sep 17 00:00:00 2001 From: JasminSForgeFlow Date: Thu, 6 Apr 2023 16:38:22 +0530 Subject: [PATCH 05/17] [IMP] account_bank_statement_import_online_ofx: Delete statement without lines --- .../online_bank_statement_provider_ofx.py | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py b/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py index 013606123..0c5d7ea6e 100644 --- a/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py +++ b/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py @@ -137,6 +137,31 @@ def import_ofx_institutions(self): else: OfxInstitution.create(vals) + def _create_or_update_statement( + self, data, statement_date_since, statement_date_until + ): + # deleting blank statement for OFX online import + res = super()._create_or_update_statement( + data, statement_date_since, statement_date_until + ) + if self.service == "OFX": + AccountBankStatement = self.env["account.bank.statement"] + statement_date = self._get_statement_date( + statement_date_since, + statement_date_until, + ) + statement = AccountBankStatement.search( + [ + ("journal_id", "=", self.journal_id.id), + ("state", "=", "open"), + ("date", "=", statement_date), + ], + limit=1, + ) + if not statement.line_ids: + statement.unlink() + return res + class OFXInstitutionLine(models.Model): _name = "ofx.institution.line" From bf54fa23b74f5527f0f5147f4e512fdedd4bb749 Mon Sep 17 00:00:00 2001 From: JasminSForgeFlow Date: Mon, 10 Jul 2023 16:18:46 +0530 Subject: [PATCH 06/17] [IMP] account_bank_statement_import_online_ofx: Update readme --- .../README.rst | 53 ++----------------- .../readme/CONFIGURE.rst | 9 ++++ .../readme/CONTRIBUTORS.rst | 3 ++ .../readme/DESCRIPTION.rst | 3 ++ .../readme/USAGE.rst | 6 +++ 5 files changed, 25 insertions(+), 49 deletions(-) create mode 100644 account_statement_import_online_ofx/readme/CONFIGURE.rst create mode 100644 account_statement_import_online_ofx/readme/CONTRIBUTORS.rst create mode 100644 account_statement_import_online_ofx/readme/DESCRIPTION.rst create mode 100644 account_statement_import_online_ofx/readme/USAGE.rst diff --git a/account_statement_import_online_ofx/README.rst b/account_statement_import_online_ofx/README.rst index efb2aa8d3..8c9836b6b 100644 --- a/account_statement_import_online_ofx/README.rst +++ b/account_statement_import_online_ofx/README.rst @@ -2,30 +2,10 @@ Online Bank Statements: OFX ================================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! 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/14.0/account_statement_import_online_paypal - :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-14-0/bank-statement-import-14-0-account_statement_import_online_paypal - :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/14.0 - :alt: Try me on Runbot - -|badge1| |badge2| |badge3| |badge4| |badge5| - -This module provides online bank statements from OFX instutitons +This module provides online bank statements from Open Financial Exchange (OFX) institutions. +You can set-up your own provider, or import a list of supported providers. +https://ofxhome.com/ is used as a data source, currently over 300 institutions are supported. + **Table of contents** @@ -83,28 +63,3 @@ Contributors * `ForgeFlow `__ * Jasmin Solanki - -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. - -.. |maintainer-alexey-pelykh| image:: https://github.com/alexey-pelykh.png?size=40px - :target: https://github.com/alexey-pelykh - :alt: alexey-pelykh - -Current `maintainer `__: - -|maintainer-alexey-pelykh| - -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_statement_import_online_ofx/readme/CONFIGURE.rst b/account_statement_import_online_ofx/readme/CONFIGURE.rst new file mode 100644 index 000000000..d5439af21 --- /dev/null +++ b/account_statement_import_online_ofx/readme/CONFIGURE.rst @@ -0,0 +1,9 @@ +To configure online bank statements provider: + +#. Go to *Invoicing > Configuration > Journals* +#. Open bank journal to configure and edit it +#. Set *Bank Feeds* to *Online* +#. Select *OFX* as online bank statements provider in + *Online Bank Statements (OCA)* section +#. Save the bank journal +#. Click on provider and configure provider-specific settings. diff --git a/account_statement_import_online_ofx/readme/CONTRIBUTORS.rst b/account_statement_import_online_ofx/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..73eeecf74 --- /dev/null +++ b/account_statement_import_online_ofx/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `ForgeFlow `__ + + * Jasmin Solanki diff --git a/account_statement_import_online_ofx/readme/DESCRIPTION.rst b/account_statement_import_online_ofx/readme/DESCRIPTION.rst new file mode 100644 index 000000000..8527917bf --- /dev/null +++ b/account_statement_import_online_ofx/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module provides online bank statements from Open Financial Exchange (OFX) institutions. +You can set-up your own provider, or import a list of supported providers. +https://ofxhome.com/ is used as a data source, currently over 300 institutions are supported. diff --git a/account_statement_import_online_ofx/readme/USAGE.rst b/account_statement_import_online_ofx/readme/USAGE.rst new file mode 100644 index 000000000..49874cc2e --- /dev/null +++ b/account_statement_import_online_ofx/readme/USAGE.rst @@ -0,0 +1,6 @@ +To pull historical bank statements: + +#. Go to *Invoicing > Configuration > Journals* +#. Select specific bank accounts +#. Launch *Actions > Online Bank Statements Pull Wizard* +#. Configure date interval and click *Pull* From 1b6a178af5249ad6a185ab5779116fec44191f40 Mon Sep 17 00:00:00 2001 From: PauBForgeFlow Date: Fri, 28 Jul 2023 11:19:40 +0200 Subject: [PATCH 07/17] [IMP] account_statement_import_online_ofx: pre-commit stuff --- requirements.txt | 1 + .../odoo/addons/account_statement_import_online_ofx | 1 + setup/account_statement_import_online_ofx/setup.py | 6 ++++++ 3 files changed, 8 insertions(+) create mode 120000 setup/account_statement_import_online_ofx/odoo/addons/account_statement_import_online_ofx create mode 100644 setup/account_statement_import_online_ofx/setup.py diff --git a/requirements.txt b/requirements.txt index d3433a96a..5225efd4f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ chardet ofxparse xlrd +ofxtools diff --git a/setup/account_statement_import_online_ofx/odoo/addons/account_statement_import_online_ofx b/setup/account_statement_import_online_ofx/odoo/addons/account_statement_import_online_ofx new file mode 120000 index 000000000..0551abdec --- /dev/null +++ b/setup/account_statement_import_online_ofx/odoo/addons/account_statement_import_online_ofx @@ -0,0 +1 @@ +../../../../account_statement_import_online_ofx \ No newline at end of file diff --git a/setup/account_statement_import_online_ofx/setup.py b/setup/account_statement_import_online_ofx/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/account_statement_import_online_ofx/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 301e70f4b72f8fd1fdac0272af12426f2625b7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Felipe=20Mil=C3=A9o?= Date: Fri, 10 May 2024 20:37:42 -0300 Subject: [PATCH 08/17] [IMP][account_statement_import_sheet_file] Empty lines with spaces, or with simbols eg: USD/$ --- .../account_statement_import_sheet_parser.py | 12 +- .../sample_statement_en_empty_values.xlsx | Bin 0 -> 6501 bytes ...est_account_statement_import_sheet_file.py | 140 ++++++++++++++++++ 3 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 account_statement_import_sheet_file/tests/fixtures/sample_statement_en_empty_values.xlsx diff --git a/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py b/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py index cfe9069ee..babd4286f 100644 --- a/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py +++ b/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py @@ -4,6 +4,7 @@ import itertools import logging +import re from collections.abc import Iterable from datetime import datetime from decimal import Decimal @@ -459,9 +460,16 @@ def _parse_decimal(self, value, mapping): if isinstance(value, Decimal): return value elif isinstance(value, float): - return Decimal(value) - value = value or "0" + return Decimal(str(value)) thousands, decimal = mapping._get_float_separators() + # Remove all characters except digits, thousands separator, + # decimal separator, and signs + value = ( + re.sub( + r"[^\d\-+" + re.escape(thousands) + re.escape(decimal) + "]+", "", value + ) + or "0" + ) value = value.replace(thousands, "") value = value.replace(decimal, ".") return Decimal(value) diff --git a/account_statement_import_sheet_file/tests/fixtures/sample_statement_en_empty_values.xlsx b/account_statement_import_sheet_file/tests/fixtures/sample_statement_en_empty_values.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..7b9a2193eb8df879b7b8f2498463ede2936dddab GIT binary patch literal 6501 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 K^b-c&-2ETyu-R7t literal 0 HcmV?d00001 diff --git a/account_statement_import_sheet_file/tests/test_account_statement_import_sheet_file.py b/account_statement_import_sheet_file/tests/test_account_statement_import_sheet_file.py index 08caf0656..16c7dd896 100644 --- a/account_statement_import_sheet_file/tests/test_account_statement_import_sheet_file.py +++ b/account_statement_import_sheet_file/tests/test_account_statement_import_sheet_file.py @@ -3,7 +3,9 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from base64 import b64encode +from decimal import Decimal from os import path +from unittest.mock import Mock from odoo import fields from odoo.exceptions import UserError @@ -45,6 +47,12 @@ def setUp(self): "account_type": "asset_current", } ) + self.parser = self.env["account.statement.import.sheet.parser"] + # Mock the mapping object to return predefined separators + self.mock_mapping_comma_dot = Mock() + self.mock_mapping_comma_dot._get_float_separators.return_value = (",", ".") + self.mock_mapping_dot_comma = Mock() + self.mock_mapping_dot_comma._get_float_separators.return_value = (".", ",") def _data_file(self, filename, encoding=None): mode = "rt" if encoding else "rb" @@ -538,3 +546,135 @@ def test_amount_inverse_sign(self): line2 = statement.line_ids.filtered(lambda x: x.payment_ref == "LABEL 2") self.assertEqual(line2.amount, 1525.00) self.assertEqual(line2.amount_currency, 1000.00) + + def test_import_xlsx_empty_values(self): + sample_statement_map_empty_values = ( + self.AccountStatementImportSheetMapping.create( + { + "name": "Sample Statement with empty values", + "amount_type": "distinct_credit_debit", + "float_decimal_sep": "comma", + "delimiter": "n/a", + "no_header": 0, + "footer_lines_skip_count": 1, + "amount_inverse_sign": 0, + "header_lines_skip_count": 1, + "quotechar": '"', + "float_thousands_sep": "dot", + "reference_column": "REF", + "description_column": "DESCRIPTION", + "amount_credit_column": "DEBIT", + "amount_debit_column": "CREDIT", + "balance_column": "BALANCE", + "timestamp_format": "%d/%m/%Y", + "timestamp_column": "DATE", + } + ) + ) + journal = self.AccountJournal.create( + { + "name": "Bank 2", + "type": "bank", + "code": "BAN2", + "currency_id": self.currency_usd.id, + "suspense_account_id": self.suspense_account.id, + } + ) + data = self._data_file("fixtures/sample_statement_en_empty_values.xlsx") + wizard = self.AccountStatementImport.with_context(journal_id=journal.id).create( + { + "statement_filename": "fixtures/sample_statement_en_empty_values.xlsx", + "statement_file": data, + "sheet_mapping_id": sample_statement_map_empty_values.id, + } + ) + wizard.with_context( + account_statement_import_sheet_file_test=True + ).import_file_button() + statement = self.AccountBankStatement.search([("journal_id", "=", journal.id)]) + self.assertEqual(len(statement), 1) + self.assertEqual(len(statement.line_ids), 3) + + def test_parse_decimal(self): + # Define a series of test cases + test_cases = [ + ( + "1,234.56", + Decimal("1234.56"), + self.mock_mapping_comma_dot, + ), # standard case with thousands separator + ( + "1,234,567.89", + Decimal("1234567.89"), + self.mock_mapping_comma_dot, + ), # multiple thousands separators + ( + "-1,234.56", + Decimal("-1234.56"), + self.mock_mapping_comma_dot, + ), # negative value + ( + "$1,234.56", + Decimal("1234.56"), + self.mock_mapping_comma_dot, + ), # prefixed with currency symbol + ( + "1,234.56 USD", + Decimal("1234.56"), + self.mock_mapping_comma_dot, + ), # suffixed with currency code + ( + " 1,234.56 ", + Decimal("1234.56"), + self.mock_mapping_comma_dot, + ), # leading and trailing spaces + ( + "not a number", + Decimal("0"), + self.mock_mapping_comma_dot, + ), # non-numeric input + (" ", Decimal("0"), self.mock_mapping_comma_dot), # empty string + ("", Decimal("0"), self.mock_mapping_comma_dot), # empty space + ("USD", Decimal("0"), self.mock_mapping_comma_dot), # empty dolar + ( + "12,34.56", + Decimal("1234.56"), + self.mock_mapping_comma_dot, + ), # unusual thousand separator placement + ( + "1234,567.89", + Decimal("1234567.89"), + self.mock_mapping_comma_dot, + ), # missing one separator + ( + "1234.567,89", + Decimal("1234567.89"), + self.mock_mapping_dot_comma, + ), # inverted separators + ] + + for value, expected, mock_mapping in test_cases: + with self.subTest(value=value): + result = self.parser._parse_decimal(value, mock_mapping) + self.assertEqual(result, expected, f"Failed for value: {value}") + + def test_decimal_and_float_inputs(self): + # Test direct Decimal and float inputs + self.assertEqual( + self.parser._parse_decimal( + Decimal("-1234.56"), self.mock_mapping_comma_dot + ), + Decimal("-1234.56"), + ) + self.assertEqual( + self.parser._parse_decimal(Decimal("1234.56"), self.mock_mapping_comma_dot), + Decimal("1234.56"), + ) + self.assertEqual( + self.parser._parse_decimal(-1234.56, self.mock_mapping_comma_dot), + Decimal("-1234.56"), + ) + self.assertEqual( + self.parser._parse_decimal(1234.56, self.mock_mapping_comma_dot), + Decimal("1234.56"), + ) From 8a46e495eaf23d81f092e45f80a33289512e0541 Mon Sep 17 00:00:00 2001 From: Sergio Ariel Ameghino Date: Sun, 12 May 2024 18:42:53 +0000 Subject: [PATCH 09/17] Translated using Weblate (Spanish) Currently translated at 100.0% (100 of 100 strings) Translation: bank-statement-import-16.0/bank-statement-import-16.0-account_statement_import_sheet_file Translate-URL: https://translation.odoo-community.org/projects/bank-statement-import-16-0/bank-statement-import-16-0-account_statement_import_sheet_file/es/ --- account_statement_import_sheet_file/i18n/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/account_statement_import_sheet_file/i18n/es.po b/account_statement_import_sheet_file/i18n/es.po index f20aca562..8f5b31986 100644 --- a/account_statement_import_sheet_file/i18n/es.po +++ b/account_statement_import_sheet_file/i18n/es.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-10-18 06:13+0000\n" -"PO-Revision-Date: 2024-02-08 20:34+0000\n" -"Last-Translator: Ivorra78 \n" +"PO-Revision-Date: 2024-05-12 21:35+0000\n" +"Last-Translator: Sergio Ariel Ameghino \n" "Language-Team: none\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -606,7 +606,7 @@ msgstr "ninguno" #. module: account_statement_import_sheet_file #: model:ir.model.fields.selection,name:account_statement_import_sheet_file.selection__account_statement_import_sheet_mapping__float_thousands_sep__quote msgid "quote (')" -msgstr "" +msgstr "cita (')" #. module: account_statement_import_sheet_file #: model:ir.model.fields.selection,name:account_statement_import_sheet_file.selection__account_statement_import_sheet_mapping__delimiter__semicolon From 5342c029c70e3abdca234b48a1482e61505d413f Mon Sep 17 00:00:00 2001 From: Sergio Ariel Ameghino Date: Sun, 12 May 2024 18:40:07 +0000 Subject: [PATCH 10/17] Translated using Weblate (Spanish) Currently translated at 100.0% (5 of 5 strings) Translation: bank-statement-import-16.0/bank-statement-import-16.0-account_statement_import_qif Translate-URL: https://translation.odoo-community.org/projects/bank-statement-import-16-0/bank-statement-import-16-0-account_statement_import_qif/es/ --- account_statement_import_qif/i18n/es.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/account_statement_import_qif/i18n/es.po b/account_statement_import_qif/i18n/es.po index c96397353..e6993f2bb 100644 --- a/account_statement_import_qif/i18n/es.po +++ b/account_statement_import_qif/i18n/es.po @@ -10,14 +10,15 @@ msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-17 03:38+0000\n" -"PO-Revision-Date: 2017-12-17 03:38+0000\n" -"Last-Translator: Pedro M. Baeza , 2017\n" +"PO-Revision-Date: 2024-05-12 21:35+0000\n" +"Last-Translator: Sergio Ariel Ameghino \n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. module: account_statement_import_qif #. odoo-python @@ -28,19 +29,18 @@ msgstr "No se puede descifrar el archivo QIF." #. module: account_statement_import_qif #: model:ir.model,name:account_statement_import_qif.model_account_statement_import -#, fuzzy msgid "Import Bank Statement Files" msgstr "Importar extracto bancario" #. module: account_statement_import_qif #: model:ir.model,name:account_statement_import_qif.model_account_journal msgid "Journal" -msgstr "" +msgstr "Diario" #. module: account_statement_import_qif #: model_terms:ir.ui.view,arch_db:account_statement_import_qif.account_statement_import_form msgid "Quicken Interchange Format (.qif)" -msgstr "Quicken Interchange Format (.qif)" +msgstr "Formato de intercambio QIF" #. module: account_statement_import_qif #. odoo-python From 9f853779adb71c16475f4b965b0eb6e63a611795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Felipe=20Mil=C3=A9o?= Date: Sun, 12 May 2024 19:44:55 -0300 Subject: [PATCH 11/17] [REF][account_statement_import_sheet_file] Remove decimal --- .../account_statement_import_sheet_parser.py | 19 ++++---- ...est_account_statement_import_sheet_file.py | 46 +++++++++---------- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py b/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py index babd4286f..4697525cc 100644 --- a/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py +++ b/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py @@ -4,6 +4,7 @@ import itertools import logging +import math import re from collections.abc import Iterable from datetime import datetime @@ -84,8 +85,8 @@ def parse(self, data_file, mapping, filename): balance_end = last_line["balance"] data.update( { - "balance_start": float(balance_start), - "balance_end_real": float(balance_end), + "balance_start": balance_start, + "balance_end_real": balance_end, } ) transactions = list( @@ -337,14 +338,14 @@ def _decimal(column_name): balance = None if debit_credit is not None: - amount = amount.copy_abs() + amount = abs(amount) if debit_credit == mapping.debit_value: amount = -amount if original_amount: - original_amount = self._parse_decimal( - original_amount, mapping - ).copy_sign(amount) + original_amount = math.copysign( + self._parse_decimal(original_amount, mapping), amount + ) else: original_amount = 0.0 if mapping.amount_inverse_sign: @@ -458,9 +459,9 @@ def _convert_line_to_transactions(self, line): # noqa: C901 @api.model def _parse_decimal(self, value, mapping): if isinstance(value, Decimal): - return value + return float(value) elif isinstance(value, float): - return Decimal(str(value)) + return value thousands, decimal = mapping._get_float_separators() # Remove all characters except digits, thousands separator, # decimal separator, and signs @@ -472,4 +473,4 @@ def _parse_decimal(self, value, mapping): ) value = value.replace(thousands, "") value = value.replace(decimal, ".") - return Decimal(value) + return float(value) diff --git a/account_statement_import_sheet_file/tests/test_account_statement_import_sheet_file.py b/account_statement_import_sheet_file/tests/test_account_statement_import_sheet_file.py index 16c7dd896..4c767609b 100644 --- a/account_statement_import_sheet_file/tests/test_account_statement_import_sheet_file.py +++ b/account_statement_import_sheet_file/tests/test_account_statement_import_sheet_file.py @@ -600,55 +600,55 @@ def test_parse_decimal(self): test_cases = [ ( "1,234.56", - Decimal("1234.56"), + 1234.56, self.mock_mapping_comma_dot, ), # standard case with thousands separator ( "1,234,567.89", - Decimal("1234567.89"), + 1234567.89, self.mock_mapping_comma_dot, ), # multiple thousands separators ( "-1,234.56", - Decimal("-1234.56"), + -1234.56, self.mock_mapping_comma_dot, ), # negative value ( "$1,234.56", - Decimal("1234.56"), + 1234.56, self.mock_mapping_comma_dot, ), # prefixed with currency symbol ( "1,234.56 USD", - Decimal("1234.56"), + 1234.56, self.mock_mapping_comma_dot, ), # suffixed with currency code ( " 1,234.56 ", - Decimal("1234.56"), + 1234.56, self.mock_mapping_comma_dot, ), # leading and trailing spaces ( "not a number", - Decimal("0"), + 0, self.mock_mapping_comma_dot, ), # non-numeric input - (" ", Decimal("0"), self.mock_mapping_comma_dot), # empty string - ("", Decimal("0"), self.mock_mapping_comma_dot), # empty space - ("USD", Decimal("0"), self.mock_mapping_comma_dot), # empty dolar + (" ", 0, self.mock_mapping_comma_dot), # empty string + ("", 0, self.mock_mapping_comma_dot), # empty space + ("USD", 0, self.mock_mapping_comma_dot), # empty dolar ( "12,34.56", - Decimal("1234.56"), + 1234.56, self.mock_mapping_comma_dot, ), # unusual thousand separator placement ( "1234,567.89", - Decimal("1234567.89"), + 1234567.89, self.mock_mapping_comma_dot, ), # missing one separator ( "1234.567,89", - Decimal("1234567.89"), + 1234567.89, self.mock_mapping_dot_comma, ), # inverted separators ] @@ -661,20 +661,20 @@ def test_parse_decimal(self): def test_decimal_and_float_inputs(self): # Test direct Decimal and float inputs self.assertEqual( - self.parser._parse_decimal( - Decimal("-1234.56"), self.mock_mapping_comma_dot - ), - Decimal("-1234.56"), + self.parser._parse_decimal(-1234.56, self.mock_mapping_comma_dot), + -1234.56, ) self.assertEqual( - self.parser._parse_decimal(Decimal("1234.56"), self.mock_mapping_comma_dot), - Decimal("1234.56"), + self.parser._parse_decimal(1234.56, self.mock_mapping_comma_dot), + 1234.56, ) self.assertEqual( - self.parser._parse_decimal(-1234.56, self.mock_mapping_comma_dot), - Decimal("-1234.56"), + self.parser._parse_decimal( + Decimal("-1234.56"), self.mock_mapping_comma_dot + ), + -1234.56, ) self.assertEqual( - self.parser._parse_decimal(1234.56, self.mock_mapping_comma_dot), - Decimal("1234.56"), + self.parser._parse_decimal(Decimal("1234.56"), self.mock_mapping_comma_dot), + 1234.56, ) From e01764b86ed683272bf71330914911ebc073b644 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 13 May 2024 06:59:57 +0000 Subject: [PATCH 12/17] [BOT] post-merge updates --- README.md | 2 +- account_statement_import_sheet_file/README.rst | 2 +- account_statement_import_sheet_file/__manifest__.py | 2 +- .../static/description/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 712fe6272..3303155d0 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ addon | version | maintainers | summary [account_statement_import_online_ponto](account_statement_import_online_ponto/) | 16.0.1.1.1 | | Online Bank Statements: MyPonto.com [account_statement_import_online_qonto](account_statement_import_online_qonto/) | 16.0.1.0.0 | | Online Bank Statements: Qonto [account_statement_import_qif](account_statement_import_qif/) | 16.0.1.0.0 | | Import QIF Bank Statements -[account_statement_import_sheet_file](account_statement_import_sheet_file/) | 16.0.1.1.1 | [![alexey-pelykh](https://github.com/alexey-pelykh.png?size=30px)](https://github.com/alexey-pelykh) | Import TXT/CSV or XLSX files as Bank Statements in Odoo +[account_statement_import_sheet_file](account_statement_import_sheet_file/) | 16.0.1.1.2 | [![alexey-pelykh](https://github.com/alexey-pelykh.png?size=30px)](https://github.com/alexey-pelykh) | Import TXT/CSV or XLSX files as Bank Statements in Odoo [//]: # (end addons) diff --git a/account_statement_import_sheet_file/README.rst b/account_statement_import_sheet_file/README.rst index 0db1aa72b..b661fdcfc 100644 --- a/account_statement_import_sheet_file/README.rst +++ b/account_statement_import_sheet_file/README.rst @@ -7,7 +7,7 @@ Bank Statement TXT/CSV/XLSX Import !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:622f4de81eaea0676a7c563933b1d1a0d0eae98e7e22d882526af7b611ba3d50 + !! source digest: sha256:52fd7c31d7753fa4ea912b113bfc30c98f54839022ff9071e6b4604483f28f30 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/account_statement_import_sheet_file/__manifest__.py b/account_statement_import_sheet_file/__manifest__.py index cd6b19da0..5219c57c2 100644 --- a/account_statement_import_sheet_file/__manifest__.py +++ b/account_statement_import_sheet_file/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Bank Statement TXT/CSV/XLSX Import", "summary": "Import TXT/CSV or XLSX files as Bank Statements in Odoo", - "version": "16.0.1.1.1", + "version": "16.0.1.1.2", "category": "Accounting", "website": "https://github.com/OCA/bank-statement-import", "author": "ForgeFlow, CorporateHub, Odoo Community Association (OCA)", diff --git a/account_statement_import_sheet_file/static/description/index.html b/account_statement_import_sheet_file/static/description/index.html index 57d32c8b7..b924b868e 100644 --- a/account_statement_import_sheet_file/static/description/index.html +++ b/account_statement_import_sheet_file/static/description/index.html @@ -366,7 +366,7 @@

Bank Statement TXT/CSV/XLSX Import

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:622f4de81eaea0676a7c563933b1d1a0d0eae98e7e22d882526af7b611ba3d50 +!! source digest: sha256:52fd7c31d7753fa4ea912b113bfc30c98f54839022ff9071e6b4604483f28f30 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

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

This module allows you to import any TXT/CSV or XLSX file in Odoo as bank From 6d06ab1c42f6e363a83dbe755e6132067f594d09 Mon Sep 17 00:00:00 2001 From: Rodrigo Macedo Date: Wed, 22 May 2024 00:55:42 +0000 Subject: [PATCH 13/17] Translated using Weblate (Portuguese (Brazil)) Currently translated at 60.0% (3 of 5 strings) Translation: bank-statement-import-16.0/bank-statement-import-16.0-account_statement_import_qif Translate-URL: https://translation.odoo-community.org/projects/bank-statement-import-16-0/bank-statement-import-16-0-account_statement_import_qif/pt_BR/ --- account_statement_import_qif/i18n/pt_BR.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/account_statement_import_qif/i18n/pt_BR.po b/account_statement_import_qif/i18n/pt_BR.po index 5c11c0cc1..2fb67afce 100644 --- a/account_statement_import_qif/i18n/pt_BR.po +++ b/account_statement_import_qif/i18n/pt_BR.po @@ -9,15 +9,17 @@ msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-17 03:38+0000\n" -"PO-Revision-Date: 2017-12-17 03:38+0000\n" -"Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" -"teams/23907/pt_BR/)\n" +"PO-Revision-Date: 2024-05-22 02:47+0000\n" +"Last-Translator: Rodrigo Macedo \n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/" +"23907/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.17\n" #. module: account_statement_import_qif #. odoo-python @@ -28,9 +30,8 @@ msgstr "Não foi possível decifrar o arquivo QIF." #. module: account_statement_import_qif #: model:ir.model,name:account_statement_import_qif.model_account_statement_import -#, fuzzy msgid "Import Bank Statement Files" -msgstr "Importar Extrato Bancário" +msgstr "Importar Arquivos Extrato Bancário" #. module: account_statement_import_qif #: model:ir.model,name:account_statement_import_qif.model_account_journal From 0df98475a35866eefd2593d6a85138956c97eeca Mon Sep 17 00:00:00 2001 From: Rodrigo Macedo Date: Wed, 22 May 2024 11:32:35 +0000 Subject: [PATCH 14/17] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (5 of 5 strings) Translation: bank-statement-import-16.0/bank-statement-import-16.0-account_statement_import_qif Translate-URL: https://translation.odoo-community.org/projects/bank-statement-import-16-0/bank-statement-import-16-0-account_statement_import_qif/pt_BR/ --- account_statement_import_qif/i18n/pt_BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/account_statement_import_qif/i18n/pt_BR.po b/account_statement_import_qif/i18n/pt_BR.po index 2fb67afce..0753ced11 100644 --- a/account_statement_import_qif/i18n/pt_BR.po +++ b/account_statement_import_qif/i18n/pt_BR.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-17 03:38+0000\n" -"PO-Revision-Date: 2024-05-22 02:47+0000\n" +"PO-Revision-Date: 2024-05-22 13:39+0000\n" "Last-Translator: Rodrigo Macedo \n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/" @@ -26,7 +26,7 @@ msgstr "" #: code:addons/account_statement_import_qif/wizards/account_statement_import_qif.py:0 #, python-format msgid "Could not decipher the QIF file." -msgstr "Não foi possível decifrar o arquivo QIF." +msgstr "Não foi possível decifrar o arquivo QIF." #. module: account_statement_import_qif #: model:ir.model,name:account_statement_import_qif.model_account_statement_import @@ -36,12 +36,12 @@ msgstr "Importar Arquivos Extrato Bancário" #. module: account_statement_import_qif #: model:ir.model,name:account_statement_import_qif.model_account_journal msgid "Journal" -msgstr "" +msgstr "Diário" #. module: account_statement_import_qif #: model_terms:ir.ui.view,arch_db:account_statement_import_qif.account_statement_import_form msgid "Quicken Interchange Format (.qif)" -msgstr "" +msgstr "Acelerar o Formato de Intercâmbio (.qif)" #. module: account_statement_import_qif #. odoo-python From f5fd86f3e8f02b2438d27debfaee05e92ef8ae68 Mon Sep 17 00:00:00 2001 From: PauBForgeFlow Date: Wed, 2 Aug 2023 10:29:59 +0200 Subject: [PATCH 15/17] [MIG] account_statement_import_online: Migration to 16.0 --- .../README.rst | 74 ++- .../__manifest__.py | 6 +- .../online_bank_statement_provider_ofx.py | 37 +- .../readme/CONFIGURE.rst | 16 +- .../static/description/index.html | 451 ++++++++++++++++++ ...est_account_statement_import_online_ofx.py | 16 +- .../online_bank_statement_pull_wizard.py | 16 +- .../online_bank_statement_pull_wizard.xml | 2 +- requirements.txt | 2 +- 9 files changed, 559 insertions(+), 61 deletions(-) create mode 100644 account_statement_import_online_ofx/static/description/index.html diff --git a/account_statement_import_online_ofx/README.rst b/account_statement_import_online_ofx/README.rst index 8c9836b6b..8e63a8fe7 100644 --- a/account_statement_import_online_ofx/README.rst +++ b/account_statement_import_online_ofx/README.rst @@ -1,11 +1,36 @@ -================================== +=========================== Online Bank Statements: OFX -================================== +=========================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:e6ebad00d6c39c92584c6ee76b5deae328742e8a81229971ce4ca37d2f1e4cb1 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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/16.0/account_statement_import_online_ofx + :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-16-0/bank-statement-import-16-0-account_statement_import_online_ofx + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/bank-statement-import&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| This module provides online bank statements from Open Financial Exchange (OFX) institutions. You can set-up your own provider, or import a list of supported providers. -https://ofxhome.com/ is used as a data source, currently over 300 institutions are supported. - +https://ofxhome.com/ is used as a data source, currently over 300 institutions are supported. **Table of contents** @@ -17,13 +42,15 @@ Configuration To configure online bank statements provider: -#. Go to *Invoicing > Configuration > Journals* -#. Open bank journal to configure and edit it -#. Set *Bank Feeds* to *Online* -#. Select *OFX* as online bank statements provider in - *Online Bank Statements (OCA)* section -#. Save the bank journal -#. Click on provider and configure provider-specific settings. +#. Go to *Invoicing > Configuration > Online Bank Statement Providers* +#. Create a provider and configure provider-specific settings. + +If you want to allow empty bank statements to be created every time the +information is pulled, you can check the option "Allow empty statements" +at the provider configuration level. + +**NOTE**: To access these features, user needs to belong to +*Show Full Accounting Features* group. Usage ===== @@ -35,17 +62,13 @@ To pull historical bank statements: #. Launch *Actions > Online Bank Statements Pull Wizard* #. Configure date interval and click *Pull* -Known issues / Roadmap -====================== - - 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 `_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -63,3 +86,20 @@ Contributors * `ForgeFlow `__ * Jasmin Solanki + +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_statement_import_online_ofx/__manifest__.py b/account_statement_import_online_ofx/__manifest__.py index b81154df1..cdf2c2106 100644 --- a/account_statement_import_online_ofx/__manifest__.py +++ b/account_statement_import_online_ofx/__manifest__.py @@ -3,13 +3,15 @@ { "name": "Online Bank Statements: OFX", - "version": "14.0.1.0.0", + "version": "16.0.1.0.0", "author": "ForgeFlow, Odoo Community Association (OCA)", "website": "https://github.com/OCA/bank-statement-import", "license": "AGPL-3", "category": "Accounting", "summary": "Online bank statements for OFX", - "depends": ["account_statement_import_online"], + "depends": [ + "account_statement_import_online", + ], "external_dependencies": {"python": ["ofxtools", "ofxparse"]}, "data": [ "security/ir.model.access.csv", diff --git a/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py b/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py index 0c5d7ea6e..5be103dc9 100644 --- a/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py +++ b/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py @@ -97,7 +97,7 @@ def _obtain_statement_data(self, date_since, date_until): except Exception as e: raise UserError( _("The following problem occurred during import.\n\n %s") % str(e) - ) + ) from e return lines, {} @api.model @@ -118,14 +118,17 @@ def _prepare_ofx_transaction_line(self, transaction): def import_ofx_institutions(self): OfxInstitution = self.env["ofx.institution"] try: - with requests.get("http://www.ofxhome.com/api.php?all=yes") as f: + with requests.get( + "http://www.ofxhome.com/api.php?all=yes", timeout=30 + ) as f: response = f.text institute_list = { fi.get("id").strip(): fi.get("name").strip() for fi in ET.fromstring(response) } except Exception as e: - raise UserError(_(e)) + raise UserError(_(e)) from e + for ofxhome_id, name in institute_list.items(): institute = OfxInstitution.search([("ofxhome_id", "=", ofxhome_id)]) vals = { @@ -145,19 +148,27 @@ def _create_or_update_statement( data, statement_date_since, statement_date_until ) if self.service == "OFX": - AccountBankStatement = self.env["account.bank.statement"] - statement_date = self._get_statement_date( + unfiltered_lines, statement_values = data + if not unfiltered_lines: + unfiltered_lines = [] + if not statement_values: + statement_values = {} + statement_values["name"] = self.make_statement_name(statement_date_since) + filtered_lines = self._get_statement_filtered_lines( + unfiltered_lines, + statement_values, statement_date_since, statement_date_until, ) - statement = AccountBankStatement.search( - [ - ("journal_id", "=", self.journal_id.id), - ("state", "=", "open"), - ("date", "=", statement_date), - ], - limit=1, - ) + if not filtered_lines: + return + if filtered_lines: + statement_values.update( + {"line_ids": [[0, False, line] for line in filtered_lines]} + ) + self._update_statement_balances(statement_values) + statement = self._statement_create_or_write(statement_values) + self._journal_set_statement_source() if not statement.line_ids: statement.unlink() return res diff --git a/account_statement_import_online_ofx/readme/CONFIGURE.rst b/account_statement_import_online_ofx/readme/CONFIGURE.rst index d5439af21..562e6f221 100644 --- a/account_statement_import_online_ofx/readme/CONFIGURE.rst +++ b/account_statement_import_online_ofx/readme/CONFIGURE.rst @@ -1,9 +1,11 @@ To configure online bank statements provider: -#. Go to *Invoicing > Configuration > Journals* -#. Open bank journal to configure and edit it -#. Set *Bank Feeds* to *Online* -#. Select *OFX* as online bank statements provider in - *Online Bank Statements (OCA)* section -#. Save the bank journal -#. Click on provider and configure provider-specific settings. +#. Go to *Invoicing > Configuration > Online Bank Statement Providers* +#. Create a provider and configure provider-specific settings. + +If you want to allow empty bank statements to be created every time the +information is pulled, you can check the option "Allow empty statements" +at the provider configuration level. + +**NOTE**: To access these features, user needs to belong to +*Show Full Accounting Features* group. diff --git a/account_statement_import_online_ofx/static/description/index.html b/account_statement_import_online_ofx/static/description/index.html new file mode 100644 index 000000000..5e8e3a4ec --- /dev/null +++ b/account_statement_import_online_ofx/static/description/index.html @@ -0,0 +1,451 @@ + + + + + + +Online Bank Statements: OFX + + + +

+

Online Bank Statements: OFX

+ + +

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

+

This module provides online bank statements from Open Financial Exchange (OFX) institutions. +You can set-up your own provider, or import a list of supported providers. +https://ofxhome.com/ is used as a data source, currently over 300 institutions are supported.

+

Table of contents

+ +
+

Configuration

+

To configure online bank statements provider:

+
    +
  1. Go to Invoicing > Configuration > Online Bank Statement Providers
    2. +
  2. Create a provider and configure provider-specific settings.
    3. +
+

If you want to allow empty bank statements to be created every time the +information is pulled, you can check the option “Allow empty statements” +at the provider configuration level.

+

NOTE: To access these features, user needs to belong to +Show Full Accounting Features group.

+
+
+

Usage

+

To pull historical bank statements:

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

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 to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • ForgeFlow
    • +
+
+
+

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_statement_import_online_ofx/tests/test_account_statement_import_online_ofx.py b/account_statement_import_online_ofx/tests/test_account_statement_import_online_ofx.py index 655a64733..c0c2dcf52 100644 --- a/account_statement_import_online_ofx/tests/test_account_statement_import_online_ofx.py +++ b/account_statement_import_online_ofx/tests/test_account_statement_import_online_ofx.py @@ -34,17 +34,11 @@ def setUp(self): ) def test_import_online_ofx(self): - # Create bank journal - journal = self.AccountJournal.create( - { - "name": "Bank", - "type": "bank", - "code": "BANK", - "bank_statements_source": "online", - "online_bank_statement_provider": "OFX", - } - ) - provider = journal.online_bank_statement_provider_id + + provider_model = self.env["online.bank.statement.provider"] + active_id = self.env.context.get("active_id") + provider = provider_model.browse(active_id) + # Create OFX institution line in OFX provider self.OfxInstitutionLine.create( { diff --git a/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py b/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py index 3d0b8a189..af85425eb 100644 --- a/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py +++ b/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.py @@ -13,18 +13,16 @@ class OnlineBankStatementPullWizard(models.TransientModel): column1="wizard_id", column2="institution_line_id", relation="ofx_institution_line_pull_wizard_rel", - domain="[('provider_id','in',provider_ids)]", ) + is_ofx_provider = fields.Boolean() - @api.onchange("provider_ids") - def onchange_provider_ids(self): - for rec in self: - rec.is_ofx_provider = False - for provider in rec.provider_ids: - if provider.service == "OFX": - rec.is_ofx_provider = True - break + @api.onchange("date_since") + def _compute_is_ofx_provider(self): + provider_model = self.env["online.bank.statement.provider"] + active_id = self.env.context.get("active_id") + provider = provider_model.browse(active_id) + self.is_ofx_provider = provider.service == "OFX" def action_pull(self): return super( diff --git a/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.xml b/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.xml index ade08671f..45a5483a9 100644 --- a/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.xml +++ b/account_statement_import_online_ofx/wizards/online_bank_statement_pull_wizard.xml @@ -8,7 +8,7 @@ ref="account_statement_import_online.online_bank_statement_pull_wizard_form" /> - + Date: Mon, 3 Jun 2024 09:01:38 +0000 Subject: [PATCH 16/17] [UPD] Update account_statement_import_online_ofx.pot --- .../account_statement_import_online_ofx.pot | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 account_statement_import_online_ofx/i18n/account_statement_import_online_ofx.pot diff --git a/account_statement_import_online_ofx/i18n/account_statement_import_online_ofx.pot b/account_statement_import_online_ofx/i18n/account_statement_import_online_ofx.pot new file mode 100644 index 000000000..480b76d97 --- /dev/null +++ b/account_statement_import_online_ofx/i18n/account_statement_import_online_ofx.pot @@ -0,0 +1,159 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_statement_import_online_ofx +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__account_id +msgid "Account" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__bankid +msgid "Bankid" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution__create_uid +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__create_uid +msgid "Created by" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution__create_date +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__create_date +msgid "Created on" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution__display_name +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__display_name +msgid "Display Name" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution__id +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__id +msgid "ID" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model_terms:ir.ui.view,arch_db:account_statement_import_online_ofx.online_bank_statement_provider_form +msgid "Import OFX Institutions" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__institution_id +msgid "Institution" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_online_bank_statement_pull_wizard__is_ofx_provider +msgid "Is Ofx Provider" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution____last_update +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution__write_uid +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution__write_date +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__write_date +msgid "Last Updated on" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution__name +msgid "Name" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution__nickname +msgid "Nickname" +msgstr "" + +#. module: account_statement_import_online_ofx +#. odoo-python +#: code:addons/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py:0 +#, python-format +msgid "OFX Data is not available" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model,name:account_statement_import_online_ofx.model_ofx_institution +msgid "OFX Institution" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model,name:account_statement_import_online_ofx.model_ofx_institution_line +msgid "OFX Institution Line" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_online_bank_statement_pull_wizard__ofx_institution_ids +#: model_terms:ir.ui.view,arch_db:account_statement_import_online_ofx.online_bank_statement_provider_form +msgid "OFX Institutions" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_online_bank_statement_provider__ofx_institution_line_ids +msgid "Ofx Institution Line" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution__ofxhome_id +msgid "Ofxhome" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model,name:account_statement_import_online_ofx.model_online_bank_statement_provider +msgid "Online Bank Statement Provider" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model,name:account_statement_import_online_ofx.model_online_bank_statement_pull_wizard +msgid "Online Bank Statement Pull Wizard" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__password +msgid "Password" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__provider_id +msgid "Provider" +msgstr "" + +#. module: account_statement_import_online_ofx +#. odoo-python +#: code:addons/account_statement_import_online_ofx/models/online_bank_statement_provider_ofx.py:0 +#, python-format +msgid "" +"The following problem occurred during import.\n" +"\n" +" %s" +msgstr "" + +#. module: account_statement_import_online_ofx +#: model:ir.model.fields,field_description:account_statement_import_online_ofx.field_ofx_institution_line__username +msgid "Username" +msgstr "" From e2b1602d75aeb661d192100c6af583fb721862ec Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 3 Jun 2024 09:04:36 +0000 Subject: [PATCH 17/17] [BOT] post-merge updates --- README.md | 1 + setup/_metapackage/VERSION.txt | 2 +- setup/_metapackage/setup.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3303155d0..6c21feaef 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ addon | version | maintainers | summary [account_statement_import_ofx](account_statement_import_ofx/) | 16.0.1.0.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Import OFX Bank Statement [account_statement_import_online](account_statement_import_online/) | 16.0.1.2.2 | [![alexey-pelykh](https://github.com/alexey-pelykh.png?size=30px)](https://github.com/alexey-pelykh) | Online bank statements update [account_statement_import_online_gocardless](account_statement_import_online_gocardless/) | 16.0.1.1.0 | | Online Bank Statements: GoCardless +[account_statement_import_online_ofx](account_statement_import_online_ofx/) | 16.0.1.0.0 | | Online bank statements for OFX [account_statement_import_online_paypal](account_statement_import_online_paypal/) | 16.0.1.0.1 | [![alexey-pelykh](https://github.com/alexey-pelykh.png?size=30px)](https://github.com/alexey-pelykh) | Online bank statements for PayPal.com [account_statement_import_online_ponto](account_statement_import_online_ponto/) | 16.0.1.1.1 | | Online Bank Statements: MyPonto.com [account_statement_import_online_qonto](account_statement_import_online_qonto/) | 16.0.1.0.0 | | Online Bank Statements: Qonto diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index e26153f2c..01595fc9f 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -16.0.20240415.1 \ No newline at end of file +16.0.20240603.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index 43241e9a6..d290b665d 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -16,6 +16,7 @@ 'odoo-addon-account_statement_import_ofx>=16.0dev,<16.1dev', 'odoo-addon-account_statement_import_online>=16.0dev,<16.1dev', 'odoo-addon-account_statement_import_online_gocardless>=16.0dev,<16.1dev', + 'odoo-addon-account_statement_import_online_ofx>=16.0dev,<16.1dev', 'odoo-addon-account_statement_import_online_paypal>=16.0dev,<16.1dev', 'odoo-addon-account_statement_import_online_ponto>=16.0dev,<16.1dev', 'odoo-addon-account_statement_import_online_qonto>=16.0dev,<16.1dev',