From 407e300dae693351e9f83f09ef9711d0d0d85126 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Mon, 15 Apr 2013 15:56:18 +0200 Subject: [PATCH] [FIX] Licences and manifest cleanup --- account_banking/__openerp__.py | 8 ++--- account_banking_nl_abnamro/__init__.py | 31 +------------------ account_banking_nl_abnamro/__openerp__.py | 33 +++++++-------------- account_banking_nl_abnamro/abnamro.py | 31 +++++++++---------- account_banking_nl_ing/__init__.py | 4 +-- account_banking_nl_ing/__openerp__.py | 25 +++++----------- account_banking_nl_ing/ing.py | 20 ++++++------- account_banking_nl_multibank/__openerp__.py | 26 +++++----------- 8 files changed, 57 insertions(+), 121 deletions(-) diff --git a/account_banking/__openerp__.py b/account_banking/__openerp__.py index c36c17d4b..81bc377d5 100644 --- a/account_banking/__openerp__.py +++ b/account_banking/__openerp__.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- ############################################################################## # # Copyright (C) 2009 EduSense BV (). @@ -26,7 +27,7 @@ { 'name': 'Account Banking', 'version': '0.1.136', - 'license': 'GPL-3', + 'license': 'AGPL-3', 'author': 'Banking addons community', 'website': 'https://launchpad.net/banking-addons', 'category': 'Banking addons', @@ -34,8 +35,7 @@ 'account_voucher', 'account_iban_preserve_domestic', ], - 'init_xml': [], - 'update_xml': [ + 'data': [ 'security/ir.model.access.csv', 'data/account_banking_data.xml', 'wizard/bank_import_view.xml', @@ -43,7 +43,6 @@ 'wizard/banking_transaction_wizard.xml', 'workflow/account_invoice.xml', ], - 'demo_xml': [], 'external_dependencies': { 'python' : ['BeautifulSoup'], }, @@ -102,6 +101,5 @@ + No special configuration needed for the parsers, new parsers are recognized and made available at server (re)start. ''', - 'active': False, 'installable': True, } diff --git a/account_banking_nl_abnamro/__init__.py b/account_banking_nl_abnamro/__init__.py index ad5813105..151e7f003 100644 --- a/account_banking_nl_abnamro/__init__.py +++ b/account_banking_nl_abnamro/__init__.py @@ -1,31 +1,2 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Copyright (C) 2009 - 2011 EduSense BV () -# and Therp BV () -# All Rights Reserved -# -# 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 -# or Therp BV -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- import abnamro - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_banking_nl_abnamro/__openerp__.py b/account_banking_nl_abnamro/__openerp__.py index bb028e645..959d2669d 100644 --- a/account_banking_nl_abnamro/__openerp__.py +++ b/account_banking_nl_abnamro/__openerp__.py @@ -1,43 +1,33 @@ +# -*- coding: utf-8 -*- ############################################################################## # # Copyright (C) 2009 - 2011 EduSense BV () # and Therp BV () # All Rights Reserved # -# 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 -# or Therp BV -# # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # ############################################################################## + { 'name': 'abnamro (NL) Bank Statements Import', 'version': '0.1', - 'license': 'GPL-3', - 'author': 'Therp BV / EduSense BV', - 'website': 'https://launchpad.net/account-banking', - 'category': 'Account Banking', + 'license': 'AGPL-3', + 'author': ['Therp BV', 'EduSense BV'], + 'website': 'https://launchpad.net/banking-addons', + 'category': 'Banking addons', 'depends': ['account_banking'], - 'init_xml': [], - 'update_xml': [ - #'security/ir.model.access.csv', - ], - 'demo_xml': [], 'description': ''' Import filter for abnamro (NL) bank transaction files (txt/tab format). @@ -48,6 +38,5 @@ https://launchpad.net/account-banking. Imported bank transfers are organized in statements covering periods of one week, even if the imported files cover a different period. ''', - 'active': False, 'installable': True, } diff --git a/account_banking_nl_abnamro/abnamro.py b/account_banking_nl_abnamro/abnamro.py index 8e951f22f..43cf86c87 100644 --- a/account_banking_nl_abnamro/abnamro.py +++ b/account_banking_nl_abnamro/abnamro.py @@ -1,21 +1,22 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # Copyright (C) 2009 EduSense BV () # 2011 Therp BV () +# # All Rights Reserved # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # ############################################################################## @@ -28,11 +29,11 @@ Dutch Banking Tools uses the concept of 'Afschrift' or Bank Statement. Every transaction is bound to a Bank Statement. As such, this module generates Bank Statements along with Bank Transactions. ''' -from account_banking.parsers import models -from account_banking.parsers.convert import str2date -from account_banking.sepa import postalcode -from tools.translate import _ -from osv import osv +from openerp.addons.account_banking.parsers import models +from openerp.addons.account_banking.parsers.convert import str2date +from openerp.addons.account_banking.sepa import postalcode +from openerp.tools.translate import _ +from openerp.osv import orm import re import csv @@ -120,7 +121,7 @@ class transaction(models.mem_bank_transaction): self.error_message = _('No remote account for transaction type ' '%s') % self.transfer_type if self.error_message: - raise osv.except_osv(_('Error !'), _(self.error_message)) + raise orm.except_orm(_('Error !'), _(self.error_message)) return not self.error_message def parse_message(self): @@ -162,7 +163,7 @@ class transaction(models.mem_bank_transaction): 'SWOC', 'REMI', ] while items: if len(items) == 1: - raise osv.except_osv( + raise orm.except_orm( _('Error !'), _("unable to parse SEPA string: %s") % field) key = items.pop(0) @@ -171,7 +172,7 @@ class transaction(models.mem_bank_transaction): if prev_key: sepa_dict[prev_key] = sepa_dict[prev_key] + '/' + key else: - raise osv.except_osv( + raise orm.except_orm( _('Error !'), _("unable to parse SEPA string: %s") % field) else: @@ -196,7 +197,7 @@ class transaction(models.mem_bank_transaction): remote_account = account_match.group(1).zfill(10) remote_owner = account_match.group(2).strip() or '' else: - raise osv.except_osv( + raise orm.except_orm( _('Error !'), _('unable to parse GIRO string: %s') % field) elif field.startswith('BEA '): diff --git a/account_banking_nl_ing/__init__.py b/account_banking_nl_ing/__init__.py index 12fdf6088..e25cf133f 100644 --- a/account_banking_nl_ing/__init__.py +++ b/account_banking_nl_ing/__init__.py @@ -1,4 +1,2 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- import ing - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_banking_nl_ing/__openerp__.py b/account_banking_nl_ing/__openerp__.py index 11108f8f3..d44b23b58 100644 --- a/account_banking_nl_ing/__openerp__.py +++ b/account_banking_nl_ing/__openerp__.py @@ -8,39 +8,29 @@ # # All Rights Reserved # -# 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 -# or Therp BV -# # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # ############################################################################## + { 'name': 'ING (NL) Bank Statements Import', 'version': '0.1.140', - 'license': 'GPL-3', + 'license': 'AGPL-3', 'author': ['Smile', 'Therp BV', 'EduSense BV'], 'website': 'https://launchpad.net/banking-addons', 'category': 'Banking addons', 'depends': ['account_banking'], - 'init_xml': [], - 'update_xml': [ - ], - 'demo_xml': [], 'description': ''' Module to import Dutch ING bank format transaction files. The format covered is the CSV format with either 'dd-mm-yyyy' or 'yyyymmdd' date syntax. @@ -57,6 +47,5 @@ of one week, even if the imported files cover a different period. This modules contains no logic, just an import filter for account_banking. ''', - 'active': False, 'installable': True, } diff --git a/account_banking_nl_ing/ing.py b/account_banking_nl_ing/ing.py index 1b159f9aa..33dbcdb95 100644 --- a/account_banking_nl_ing/ing.py +++ b/account_banking_nl_ing/ing.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # Copyright (C) 2011 Smile (). @@ -10,25 +10,25 @@ # All Rights Reserved # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # ############################################################################## from datetime import datetime -from account_banking.parsers import models -from account_banking.parsers.convert import str2date -from account_banking.sepa import postalcode -from tools.translate import _ +from openerp.addons.account_banking.parsers import models +from openerp.addons.account_banking.parsers.convert import str2date +from openerp.addons.account_banking.sepa import postalcode +from openerp.tools.translate import _ import re import csv diff --git a/account_banking_nl_multibank/__openerp__.py b/account_banking_nl_multibank/__openerp__.py index b8a06b127..f81b53a19 100644 --- a/account_banking_nl_multibank/__openerp__.py +++ b/account_banking_nl_multibank/__openerp__.py @@ -1,46 +1,36 @@ +# -*- coding: utf-8 -*- ############################################################################## # # Copyright (C) 2009 EduSense BV (). # All Rights Reserved # -# 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 General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # ############################################################################## + { 'name': 'Account Banking', 'version': '0.62', - 'license': 'GPL-3', + 'license': 'AGPL-3', 'author': 'EduSense BV', 'website': 'http://www.edusense.nl', 'category': 'Account Banking', 'depends': ['account_banking'], - 'init_xml': [], - 'update_xml': [ - #'security/ir.model.access.csv', - ], - 'demo_xml': [], 'description': ''' Module to import Dutch Multibank format transation files. This modules contains no logic, just an import filter for account_banking. ''', - 'active': False, 'installable': True, }