From 43b8298eeed0889a2460526aa037b6ad26eacaf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Thu, 23 Jul 2015 15:32:38 +0200 Subject: [PATCH] [IMP] rename bank_statement_parse_ to account_bank_statement_import_ Move parserlib to account_bank_statement_import and remove bank_statement_parse module --- .../parserlib.py | 0 .../README.rst | 0 .../__init__.py | 0 .../__openerp__.py | 1 - .../account_bank_statement_import.py | 0 .../camt.py | 2 +- .../demo/demo_data.xml | 0 .../test_files/test-camt053.xml | 0 .../tests/__init__.py | 0 .../tests/test_import_bank_statement.py | 2 +- .../README.rst | 0 .../__init__.py | 0 .../__openerp__.py | 1 - .../mt940.py | 2 +- .../README.rst | 0 .../__init__.py | 0 .../__openerp__.py | 2 +- .../account_bank_statement_import.py | 0 .../demo/demo_data.xml | 0 .../mt940.py | 2 +- .../test_files/test-ing-old.940 | 0 .../test_files/test-ing.940 | 0 .../tests/__init__.py | 0 .../tests/test_import_bank_statement.py | 4 +- .../README.rst | 0 .../__init__.py | 0 .../__openerp__.py | 2 +- .../account_bank_statement_import.py | 0 .../mt940.py | 2 +- .../test_files/test-rabo.swi | 0 .../tests/__init__.py | 0 .../tests/test_import_bank_statement.py | 2 +- bank_statement_parse/README.rst | 49 ------------------- bank_statement_parse/__init__.py | 27 ---------- bank_statement_parse/__openerp__.py | 29 ----------- 35 files changed, 10 insertions(+), 117 deletions(-) rename {bank_statement_parse => account_bank_statement_import}/parserlib.py (100%) rename {bank_statement_parse_camt => account_bank_statement_import_camt}/README.rst (100%) rename {bank_statement_parse_camt => account_bank_statement_import_camt}/__init__.py (100%) rename {bank_statement_parse_camt => account_bank_statement_import_camt}/__openerp__.py (97%) rename {bank_statement_parse_camt => account_bank_statement_import_camt}/account_bank_statement_import.py (100%) rename {bank_statement_parse_camt => account_bank_statement_import_camt}/camt.py (99%) rename {bank_statement_parse_camt => account_bank_statement_import_camt}/demo/demo_data.xml (100%) rename {bank_statement_parse_camt => account_bank_statement_import_camt}/test_files/test-camt053.xml (100%) rename {bank_statement_parse_camt => account_bank_statement_import_camt}/tests/__init__.py (100%) rename {bank_statement_parse_camt => account_bank_statement_import_camt}/tests/test_import_bank_statement.py (96%) rename {bank_statement_parse_mt940 => account_bank_statement_import_mt940_base}/README.rst (100%) rename {bank_statement_parse_mt940 => account_bank_statement_import_mt940_base}/__init__.py (100%) rename {bank_statement_parse_mt940 => account_bank_statement_import_mt940_base}/__openerp__.py (97%) rename {bank_statement_parse_mt940 => account_bank_statement_import_mt940_base}/mt940.py (99%) rename {bank_statement_parse_nl_ing_mt940 => account_bank_statement_import_mt940_nl_ing}/README.rst (100%) rename {bank_statement_parse_nl_ing_mt940 => account_bank_statement_import_mt940_nl_ing}/__init__.py (100%) rename {bank_statement_parse_nl_ing_mt940 => account_bank_statement_import_mt940_nl_ing}/__openerp__.py (96%) rename {bank_statement_parse_nl_ing_mt940 => account_bank_statement_import_mt940_nl_ing}/account_bank_statement_import.py (100%) rename {bank_statement_parse_nl_ing_mt940 => account_bank_statement_import_mt940_nl_ing}/demo/demo_data.xml (100%) rename {bank_statement_parse_nl_ing_mt940 => account_bank_statement_import_mt940_nl_ing}/mt940.py (97%) rename {bank_statement_parse_nl_ing_mt940 => account_bank_statement_import_mt940_nl_ing}/test_files/test-ing-old.940 (100%) rename {bank_statement_parse_nl_ing_mt940 => account_bank_statement_import_mt940_nl_ing}/test_files/test-ing.940 (100%) rename {bank_statement_parse_nl_ing_mt940 => account_bank_statement_import_mt940_nl_ing}/tests/__init__.py (100%) rename {bank_statement_parse_nl_ing_mt940 => account_bank_statement_import_mt940_nl_ing}/tests/test_import_bank_statement.py (92%) rename {bank_statement_parse_nl_rabo_mt940 => account_bank_statement_import_mt940_nl_rabo}/README.rst (100%) rename {bank_statement_parse_nl_rabo_mt940 => account_bank_statement_import_mt940_nl_rabo}/__init__.py (100%) rename {bank_statement_parse_nl_rabo_mt940 => account_bank_statement_import_mt940_nl_rabo}/__openerp__.py (96%) rename {bank_statement_parse_nl_rabo_mt940 => account_bank_statement_import_mt940_nl_rabo}/account_bank_statement_import.py (100%) rename {bank_statement_parse_nl_rabo_mt940 => account_bank_statement_import_mt940_nl_rabo}/mt940.py (98%) rename {bank_statement_parse_nl_rabo_mt940 => account_bank_statement_import_mt940_nl_rabo}/test_files/test-rabo.swi (100%) rename {bank_statement_parse_nl_rabo_mt940 => account_bank_statement_import_mt940_nl_rabo}/tests/__init__.py (100%) rename {bank_statement_parse_nl_rabo_mt940 => account_bank_statement_import_mt940_nl_rabo}/tests/test_import_bank_statement.py (96%) delete mode 100644 bank_statement_parse/README.rst delete mode 100644 bank_statement_parse/__init__.py delete mode 100644 bank_statement_parse/__openerp__.py diff --git a/bank_statement_parse/parserlib.py b/account_bank_statement_import/parserlib.py similarity index 100% rename from bank_statement_parse/parserlib.py rename to account_bank_statement_import/parserlib.py diff --git a/bank_statement_parse_camt/README.rst b/account_bank_statement_import_camt/README.rst similarity index 100% rename from bank_statement_parse_camt/README.rst rename to account_bank_statement_import_camt/README.rst diff --git a/bank_statement_parse_camt/__init__.py b/account_bank_statement_import_camt/__init__.py similarity index 100% rename from bank_statement_parse_camt/__init__.py rename to account_bank_statement_import_camt/__init__.py diff --git a/bank_statement_parse_camt/__openerp__.py b/account_bank_statement_import_camt/__openerp__.py similarity index 97% rename from bank_statement_parse_camt/__openerp__.py rename to account_bank_statement_import_camt/__openerp__.py index c5f5d28..dbccdc2 100644 --- a/bank_statement_parse_camt/__openerp__.py +++ b/account_bank_statement_import_camt/__openerp__.py @@ -26,7 +26,6 @@ 'category': 'Banking addons', 'depends': [ 'account_bank_statement_import', - 'bank_statement_parse', ], 'demo': [ 'demo/demo_data.xml', diff --git a/bank_statement_parse_camt/account_bank_statement_import.py b/account_bank_statement_import_camt/account_bank_statement_import.py similarity index 100% rename from bank_statement_parse_camt/account_bank_statement_import.py rename to account_bank_statement_import_camt/account_bank_statement_import.py diff --git a/bank_statement_parse_camt/camt.py b/account_bank_statement_import_camt/camt.py similarity index 99% rename from bank_statement_parse_camt/camt.py rename to account_bank_statement_import_camt/camt.py index 379398f..5e6d719 100644 --- a/bank_statement_parse_camt/camt.py +++ b/account_bank_statement_import_camt/camt.py @@ -21,7 +21,7 @@ import re from datetime import datetime from lxml import etree -from openerp.addons.bank_statement_parse.parserlib import BankStatement +from openerp.addons.account_bank_statement_import.parserlib import BankStatement class CamtParser(object): diff --git a/bank_statement_parse_camt/demo/demo_data.xml b/account_bank_statement_import_camt/demo/demo_data.xml similarity index 100% rename from bank_statement_parse_camt/demo/demo_data.xml rename to account_bank_statement_import_camt/demo/demo_data.xml diff --git a/bank_statement_parse_camt/test_files/test-camt053.xml b/account_bank_statement_import_camt/test_files/test-camt053.xml similarity index 100% rename from bank_statement_parse_camt/test_files/test-camt053.xml rename to account_bank_statement_import_camt/test_files/test-camt053.xml diff --git a/bank_statement_parse_camt/tests/__init__.py b/account_bank_statement_import_camt/tests/__init__.py similarity index 100% rename from bank_statement_parse_camt/tests/__init__.py rename to account_bank_statement_import_camt/tests/__init__.py diff --git a/bank_statement_parse_camt/tests/test_import_bank_statement.py b/account_bank_statement_import_camt/tests/test_import_bank_statement.py similarity index 96% rename from bank_statement_parse_camt/tests/test_import_bank_statement.py rename to account_bank_statement_import_camt/tests/test_import_bank_statement.py index fa845ca..8a1694f 100644 --- a/bank_statement_parse_camt/tests/test_import_bank_statement.py +++ b/account_bank_statement_import_camt/tests/test_import_bank_statement.py @@ -37,7 +37,7 @@ class TestImport(TestStatementFile): ] # statement name is account number + '-' + date of last 62F line: self._test_statement_import( - 'bank_statement_parse_camt', 'test-camt053.xml', + 'account_bank_statement_import_camt', 'test-camt053.xml', '1234Test/1', local_account='NL77ABNA0574908765', start_balance=15568.27, end_balance=15121.12, diff --git a/bank_statement_parse_mt940/README.rst b/account_bank_statement_import_mt940_base/README.rst similarity index 100% rename from bank_statement_parse_mt940/README.rst rename to account_bank_statement_import_mt940_base/README.rst diff --git a/bank_statement_parse_mt940/__init__.py b/account_bank_statement_import_mt940_base/__init__.py similarity index 100% rename from bank_statement_parse_mt940/__init__.py rename to account_bank_statement_import_mt940_base/__init__.py diff --git a/bank_statement_parse_mt940/__openerp__.py b/account_bank_statement_import_mt940_base/__openerp__.py similarity index 97% rename from bank_statement_parse_mt940/__openerp__.py rename to account_bank_statement_import_mt940_base/__openerp__.py index 1de9928..760851b 100644 --- a/bank_statement_parse_mt940/__openerp__.py +++ b/account_bank_statement_import_mt940_base/__openerp__.py @@ -26,7 +26,6 @@ 'category': 'Banking addons', 'depends': [ 'account_bank_statement_import', - 'bank_statement_parse', ], 'installable': True } diff --git a/bank_statement_parse_mt940/mt940.py b/account_bank_statement_import_mt940_base/mt940.py similarity index 99% rename from bank_statement_parse_mt940/mt940.py rename to account_bank_statement_import_mt940_base/mt940.py index a164583..c410caf 100644 --- a/bank_statement_parse_mt940/mt940.py +++ b/account_bank_statement_import_mt940_base/mt940.py @@ -22,7 +22,7 @@ import re import logging from datetime import datetime -from openerp.addons.bank_statement_parse.parserlib import BankStatement +from openerp.addons.account_bank_statement_import.parserlib import BankStatement def str2amount(sign, amount_str): diff --git a/bank_statement_parse_nl_ing_mt940/README.rst b/account_bank_statement_import_mt940_nl_ing/README.rst similarity index 100% rename from bank_statement_parse_nl_ing_mt940/README.rst rename to account_bank_statement_import_mt940_nl_ing/README.rst diff --git a/bank_statement_parse_nl_ing_mt940/__init__.py b/account_bank_statement_import_mt940_nl_ing/__init__.py similarity index 100% rename from bank_statement_parse_nl_ing_mt940/__init__.py rename to account_bank_statement_import_mt940_nl_ing/__init__.py diff --git a/bank_statement_parse_nl_ing_mt940/__openerp__.py b/account_bank_statement_import_mt940_nl_ing/__openerp__.py similarity index 96% rename from bank_statement_parse_nl_ing_mt940/__openerp__.py rename to account_bank_statement_import_mt940_nl_ing/__openerp__.py index 2bd6393..5e9b51f 100644 --- a/bank_statement_parse_nl_ing_mt940/__openerp__.py +++ b/account_bank_statement_import_mt940_nl_ing/__openerp__.py @@ -25,7 +25,7 @@ 'website': 'https://github.com/OCA/bank-statement-import', 'category': 'Banking addons', 'depends': [ - 'bank_statement_parse_mt940' + 'account_bank_statement_import_mt940_base' ], 'demo': [ 'demo/demo_data.xml', diff --git a/bank_statement_parse_nl_ing_mt940/account_bank_statement_import.py b/account_bank_statement_import_mt940_nl_ing/account_bank_statement_import.py similarity index 100% rename from bank_statement_parse_nl_ing_mt940/account_bank_statement_import.py rename to account_bank_statement_import_mt940_nl_ing/account_bank_statement_import.py diff --git a/bank_statement_parse_nl_ing_mt940/demo/demo_data.xml b/account_bank_statement_import_mt940_nl_ing/demo/demo_data.xml similarity index 100% rename from bank_statement_parse_nl_ing_mt940/demo/demo_data.xml rename to account_bank_statement_import_mt940_nl_ing/demo/demo_data.xml diff --git a/bank_statement_parse_nl_ing_mt940/mt940.py b/account_bank_statement_import_mt940_nl_ing/mt940.py similarity index 97% rename from bank_statement_parse_nl_ing_mt940/mt940.py rename to account_bank_statement_import_mt940_nl_ing/mt940.py index cebca5c..5111ab0 100644 --- a/bank_statement_parse_nl_ing_mt940/mt940.py +++ b/account_bank_statement_import_mt940_nl_ing/mt940.py @@ -19,7 +19,7 @@ # ############################################################################## import re -from openerp.addons.bank_statement_parse_mt940.mt940 import ( +from openerp.addons.account_bank_statement_import_mt940_base.mt940 import ( MT940, str2amount, get_subfields, handle_common_subfields) diff --git a/bank_statement_parse_nl_ing_mt940/test_files/test-ing-old.940 b/account_bank_statement_import_mt940_nl_ing/test_files/test-ing-old.940 similarity index 100% rename from bank_statement_parse_nl_ing_mt940/test_files/test-ing-old.940 rename to account_bank_statement_import_mt940_nl_ing/test_files/test-ing-old.940 diff --git a/bank_statement_parse_nl_ing_mt940/test_files/test-ing.940 b/account_bank_statement_import_mt940_nl_ing/test_files/test-ing.940 similarity index 100% rename from bank_statement_parse_nl_ing_mt940/test_files/test-ing.940 rename to account_bank_statement_import_mt940_nl_ing/test_files/test-ing.940 diff --git a/bank_statement_parse_nl_ing_mt940/tests/__init__.py b/account_bank_statement_import_mt940_nl_ing/tests/__init__.py similarity index 100% rename from bank_statement_parse_nl_ing_mt940/tests/__init__.py rename to account_bank_statement_import_mt940_nl_ing/tests/__init__.py diff --git a/bank_statement_parse_nl_ing_mt940/tests/test_import_bank_statement.py b/account_bank_statement_import_mt940_nl_ing/tests/test_import_bank_statement.py similarity index 92% rename from bank_statement_parse_nl_ing_mt940/tests/test_import_bank_statement.py rename to account_bank_statement_import_mt940_nl_ing/tests/test_import_bank_statement.py index 09c5fd1..d83f19f 100644 --- a/bank_statement_parse_nl_ing_mt940/tests/test_import_bank_statement.py +++ b/account_bank_statement_import_mt940_nl_ing/tests/test_import_bank_statement.py @@ -30,7 +30,7 @@ class TestImport(TestStatementFile): def test_old_statement_import(self): """Test correct creation of single statement from old format.""" self._test_statement_import( - 'bank_statement_parse_nl_ing_mt940', 'test-ing-old.940', + 'account_bank_statement_import_mt940_nl_ing', 'test-ing-old.940', 'NL77INGB0574908765-2014-01-20', start_balance=662.23, end_balance=564.35 ) @@ -46,7 +46,7 @@ class TestImport(TestStatementFile): }, ] self._test_statement_import( - 'bank_statement_parse_nl_ing_mt940', 'test-ing.940', + 'account_bank_statement_import_mt940_nl_ing', 'test-ing.940', 'NL77INGB0574908765-2014-02-20', start_balance=662.23, end_balance=564.35, transactions=transactions diff --git a/bank_statement_parse_nl_rabo_mt940/README.rst b/account_bank_statement_import_mt940_nl_rabo/README.rst similarity index 100% rename from bank_statement_parse_nl_rabo_mt940/README.rst rename to account_bank_statement_import_mt940_nl_rabo/README.rst diff --git a/bank_statement_parse_nl_rabo_mt940/__init__.py b/account_bank_statement_import_mt940_nl_rabo/__init__.py similarity index 100% rename from bank_statement_parse_nl_rabo_mt940/__init__.py rename to account_bank_statement_import_mt940_nl_rabo/__init__.py diff --git a/bank_statement_parse_nl_rabo_mt940/__openerp__.py b/account_bank_statement_import_mt940_nl_rabo/__openerp__.py similarity index 96% rename from bank_statement_parse_nl_rabo_mt940/__openerp__.py rename to account_bank_statement_import_mt940_nl_rabo/__openerp__.py index ffc791c..629ca6d 100644 --- a/bank_statement_parse_nl_rabo_mt940/__openerp__.py +++ b/account_bank_statement_import_mt940_nl_rabo/__openerp__.py @@ -24,7 +24,7 @@ 'website': 'https://github.com/OCA/bank-statement-import', 'category': 'Banking addons', 'depends': [ - 'bank_statement_parse_mt940' + 'account_bank_statement_import_mt940_base' ], 'auto_install': False, 'installable': True, diff --git a/bank_statement_parse_nl_rabo_mt940/account_bank_statement_import.py b/account_bank_statement_import_mt940_nl_rabo/account_bank_statement_import.py similarity index 100% rename from bank_statement_parse_nl_rabo_mt940/account_bank_statement_import.py rename to account_bank_statement_import_mt940_nl_rabo/account_bank_statement_import.py diff --git a/bank_statement_parse_nl_rabo_mt940/mt940.py b/account_bank_statement_import_mt940_nl_rabo/mt940.py similarity index 98% rename from bank_statement_parse_nl_rabo_mt940/mt940.py rename to account_bank_statement_import_mt940_nl_rabo/mt940.py index 4533f6e..18f073a 100644 --- a/bank_statement_parse_nl_rabo_mt940/mt940.py +++ b/account_bank_statement_import_mt940_nl_rabo/mt940.py @@ -20,7 +20,7 @@ ############################################################################## import re from string import printable -from openerp.addons.bank_statement_parse_mt940.mt940 import ( +from openerp.addons.account_bank_statement_import_mt940_base.mt940 import ( MT940, str2amount, get_subfields, handle_common_subfields) diff --git a/bank_statement_parse_nl_rabo_mt940/test_files/test-rabo.swi b/account_bank_statement_import_mt940_nl_rabo/test_files/test-rabo.swi similarity index 100% rename from bank_statement_parse_nl_rabo_mt940/test_files/test-rabo.swi rename to account_bank_statement_import_mt940_nl_rabo/test_files/test-rabo.swi diff --git a/bank_statement_parse_nl_rabo_mt940/tests/__init__.py b/account_bank_statement_import_mt940_nl_rabo/tests/__init__.py similarity index 100% rename from bank_statement_parse_nl_rabo_mt940/tests/__init__.py rename to account_bank_statement_import_mt940_nl_rabo/tests/__init__.py diff --git a/bank_statement_parse_nl_rabo_mt940/tests/test_import_bank_statement.py b/account_bank_statement_import_mt940_nl_rabo/tests/test_import_bank_statement.py similarity index 96% rename from bank_statement_parse_nl_rabo_mt940/tests/test_import_bank_statement.py rename to account_bank_statement_import_mt940_nl_rabo/tests/test_import_bank_statement.py index bfddeec..476b0a6 100644 --- a/bank_statement_parse_nl_rabo_mt940/tests/test_import_bank_statement.py +++ b/account_bank_statement_import_mt940_nl_rabo/tests/test_import_bank_statement.py @@ -38,7 +38,7 @@ class TestImport(TestStatementFile): ] # statement name is account number + '-' + date of last 62F line: self._test_statement_import( - 'bank_statement_parse_nl_rabo_mt940', 'test-rabo.swi', + 'account_bank_statement_import_mt940_nl_rabo', 'test-rabo.swi', 'NL34RABO0142623393-2014-01-07', local_account='NL34RABO0142623393', start_balance=4433.52, end_balance=4798.91, diff --git a/bank_statement_parse/README.rst b/bank_statement_parse/README.rst deleted file mode 100644 index 68ea3ad..0000000 --- a/bank_statement_parse/README.rst +++ /dev/null @@ -1,49 +0,0 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :alt: License: AGPL-3 - -Bank Statement Parse -==================== - -This module makes it easy to write parsers for bank statement files, by -providing common functionality. The module is especially usefull for -converting the parsers written for previous versions of OpenERp / Odoo. - -Known issues / Roadmap -====================== - -* None - -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 -`here `_. - - -Credits -======= - -Contributors ------------- - -* Stefan Rijnhart -* Ronald Portier - -Maintainer ----------- - -.. image:: https://odoo-community.org/logo.png - :alt: Odoo Community Association - :target: https://odoo-community.org - -This module is maintained by the OCA. - -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. - -To contribute to this module, please visit http://odoo-community.org. -This module should make it easy to migrate bank statement import -modules written for earlies versions of Odoo/OpenERP. diff --git a/bank_statement_parse/__init__.py b/bank_statement_parse/__init__.py deleted file mode 100644 index 835a19c..0000000 --- a/bank_statement_parse/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- encoding: utf-8 -*- -"""Classes and models to parse bank statements and import them into Odoo.""" -############################################################################## -# -# Copyright (C) 2014-2015 Therp BV . -# -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential -# consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract EduSense BV -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -from . import parserlib diff --git a/bank_statement_parse/__openerp__.py b/bank_statement_parse/__openerp__.py deleted file mode 100644 index ffb34fe..0000000 --- a/bank_statement_parse/__openerp__.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Copyright (C) 2015 Therp BV . -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -{ - 'name': 'Bank Statement Import Parse', - 'version': '0.5', - 'license': 'AGPL-3', - 'author': 'Odoo Community Association (OCA), Therp BV', - 'website': 'https://github.com/OCA/bank-statement-import', - 'category': 'Banking addons', - 'installable': True, - 'auto_install': False, -}