diff --git a/server_environment/__init__.py b/server_environment/__init__.py index a098413..52bc6e6 100644 --- a/server_environment/__init__.py +++ b/server_environment/__init__.py @@ -1,22 +1,3 @@ -############################################################################## -# -# Adapted by Nicolas Bessi. Copyright Camptocamp SA -# Based on Florent Xicluna original code. Copyright Wingo SA -# -# 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 . -# -############################################################################## from . import models from . import server_env from .server_env import serv_config, setboolean diff --git a/server_environment/__manifest__.py b/server_environment/__manifest__.py index 7b0cbf2..334e087 100644 --- a/server_environment/__manifest__.py +++ b/server_environment/__manifest__.py @@ -1,6 +1,6 @@ # Copyright Wingo SA # Copyright 2018 Camptocamp (https://www.camptocamp.com). -# License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) { "name": "server configuration environment files", @@ -9,7 +9,7 @@ "author": "Camptocamp,Odoo Community Association (OCA)", "summary": "move some configurations out of the database", "website": "https://github.com/OCA/server-env", - "license": "GPL-3 or any later version", + "license": "LGPL-3", "category": "Tools", "data": [ "security/ir.model.access.csv", diff --git a/server_environment/models/server_env_mixin.py b/server_environment/models/server_env_mixin.py index a57f662..112e675 100644 --- a/server_environment/models/server_env_mixin.py +++ b/server_environment/models/server_env_mixin.py @@ -1,5 +1,5 @@ # Copyright 2018 Camptocamp (https://www.camptocamp.com). -# License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) import logging from functools import partialmethod diff --git a/server_environment/models/server_env_tech_name_mixin.py b/server_environment/models/server_env_tech_name_mixin.py index 02736c7..d865184 100644 --- a/server_environment/models/server_env_tech_name_mixin.py +++ b/server_environment/models/server_env_tech_name_mixin.py @@ -1,6 +1,6 @@ # Copyright 2020 Camptocamp (http://www.camptocamp.com) # @author Simone Orsi -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) from odoo import api, fields, models diff --git a/server_environment/security/res_groups.xml b/server_environment/security/res_groups.xml index 8d1808d..10a082b 100644 --- a/server_environment/security/res_groups.xml +++ b/server_environment/security/res_groups.xml @@ -1,4 +1,8 @@ + View Server Environment Configuration diff --git a/server_environment/server_env.py b/server_environment/server_env.py index a0b265c..d291609 100644 --- a/server_environment/server_env.py +++ b/server_environment/server_env.py @@ -1,8 +1,6 @@ -# Copyright 2020 Camptocamp (http://www.camptocamp.com) -# @author Nicolas Bessi # Based on Florent Xicluna original code. Copyright Wingo SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - +# Adapted by Nicolas Bessi. Copyright Camptocamp SA +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) import configparser import logging diff --git a/server_environment/system_info.py b/server_environment/system_info.py index 7b08ce1..00668f8 100644 --- a/server_environment/system_info.py +++ b/server_environment/system_info.py @@ -1,22 +1,6 @@ -############################################################################## -# -# Adapted by Nicolas Bessi. Copyright Camptocamp SA -# Based on Florent Xicluna original code. Copyright Wingo SA -# -# 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 . -# -############################################################################## +# Based on Florent Xicluna original code. Copyright Wingo SA +# Adapted by Nicolas Bessi. Copyright Camptocamp SA +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) import locale import os diff --git a/server_environment/tests/common.py b/server_environment/tests/common.py index 519706f..7e13ac0 100644 --- a/server_environment/tests/common.py +++ b/server_environment/tests/common.py @@ -1,5 +1,5 @@ # Copyright 2018 Camptocamp (https://www.camptocamp.com). -# License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) import os from contextlib import contextmanager diff --git a/server_environment/tests/test_environment_variable.py b/server_environment/tests/test_environment_variable.py index 5c21677..4204790 100644 --- a/server_environment/tests/test_environment_variable.py +++ b/server_environment/tests/test_environment_variable.py @@ -1,5 +1,5 @@ # Copyright 2018 Camptocamp (https://www.camptocamp.com). -# License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) from unittest.mock import patch diff --git a/server_environment/tests/test_server_environment.py b/server_environment/tests/test_server_environment.py index 892e94a..0abc84a 100644 --- a/server_environment/tests/test_server_environment.py +++ b/server_environment/tests/test_server_environment.py @@ -1,5 +1,6 @@ # Copyright 2018 Camptocamp (https://www.camptocamp.com). -# License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) + from unittest.mock import patch from odoo.tools.config import config as odoo_config