From 1070b83e14ebb7ecd1349969fd0cdb2bdffc9db2 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 16 May 2017 13:42:04 +0200 Subject: [PATCH] [FIX] l10n_cn*, payment_sips: clarify obsolete licensing info The license info for these modules was a leftover from previous versions. Once integrated in Odoo Community they share the same license as all other modules, as mentioned in the LICENSE notice at the top of the files. opw-743686 --- addons/l10n_cn/__openerp__.py | 1 - addons/l10n_cn_small_business/__openerp__.py | 1 - addons/l10n_cn_standard/__openerp__.py | 1 - addons/payment_sips/__openerp__.py | 22 ++++---------------- addons/payment_sips/controllers/main.py | 2 ++ addons/payment_sips/models/sips.py | 2 ++ 6 files changed, 8 insertions(+), 21 deletions(-) diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py index 6530560f13f..a5041dc0f59 100644 --- a/addons/l10n_cn/__openerp__.py +++ b/addons/l10n_cn/__openerp__.py @@ -27,6 +27,5 @@ 'base_data.xml', 'account_chart_type.xml', ], - 'license': 'GPL-3', 'installable': True, } diff --git a/addons/l10n_cn_small_business/__openerp__.py b/addons/l10n_cn_small_business/__openerp__.py index 43e9ab5fb0c..432ccda4e8a 100644 --- a/addons/l10n_cn_small_business/__openerp__.py +++ b/addons/l10n_cn_small_business/__openerp__.py @@ -27,6 +27,5 @@ 'account_chart_template.xml', 'account_chart_template.yml', ], - 'license': 'GPL-3', 'installable': True, } diff --git a/addons/l10n_cn_standard/__openerp__.py b/addons/l10n_cn_standard/__openerp__.py index beb68e335dd..6adfaa2bae1 100644 --- a/addons/l10n_cn_standard/__openerp__.py +++ b/addons/l10n_cn_standard/__openerp__.py @@ -27,6 +27,5 @@ 'account_chart_template.xml', 'account_chart_template.yml', ], - 'license': 'GPL-3', 'installable': True, } diff --git a/addons/payment_sips/__openerp__.py b/addons/payment_sips/__openerp__.py index 08298fbfd3f..9ca3fa9c1c1 100644 --- a/addons/payment_sips/__openerp__.py +++ b/addons/payment_sips/__openerp__.py @@ -1,22 +1,8 @@ # -*- encoding: utf-8 -*- -############################################################################## -# -# Copyright Eezee-It -# -# 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 . -# -############################################################################## +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +# Copyright 2015 Eezee-It + { 'name': 'Worldline SIPS', 'version': '1.0', diff --git a/addons/payment_sips/controllers/main.py b/addons/payment_sips/controllers/main.py index 02c975d94e2..29fc38a7af0 100644 --- a/addons/payment_sips/controllers/main.py +++ b/addons/payment_sips/controllers/main.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +# Copyright 2015 Eezee-It + import json import logging import werkzeug diff --git a/addons/payment_sips/models/sips.py b/addons/payment_sips/models/sips.py index 506a9118ea6..d3b659aebfd 100644 --- a/addons/payment_sips/models/sips.py +++ b/addons/payment_sips/models/sips.py @@ -1,5 +1,7 @@ # -*- coding: utf-'8' "-*-" +# Copyright 2015 Eezee-It + import json import logging from hashlib import sha256