odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] rml2html: incorrect license headers in some source files, reported and contributed by Alec Leamas 

Mixing LGPL 2.1 and AGPL 3.0 in the same source file
is incorrect, and the AGPLv3 license was added by
mistake: keep only LGPL license and preserve
copypright info.

lp bug: https://launchpad.net/bugs/1167034 fixed

bzr revid: odo@openerp.com-20130422170420-in1wo45v3q8q0fhr
This commit is contained in:
Olivier Dony 2013-04-22 19:04:20 +02:00
parent 4b85daf182
commit 41146460c0
3 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openerp/report/render/rml2html/__init__.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
# #
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################

21
openerp/report/render/rml2html/rml2html.py
View File

@ -1,25 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
# #
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
# Copyright (C) 2005, Fabien Pinckaers, UCL, FSA # Copyright (C) 2005, Fabien Pinckaers, UCL, FSA
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -34,6 +17,8 @@
# You should have received a copy of the GNU Lesser General Public # You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software # License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
##############################################################################
import sys import sys
import cStringIO import cStringIO

27
openerp/report/render/rml2html/utils.py
View File

@ -1,21 +1,22 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
# #
# This program is free software: you can redistribute it and/or modify # Copyright (C) 2005, Fabien Pinckaers, UCL, FSA
# it under the terms of the GNU Affero General Public License as # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
# 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, # This library is free software; you can redistribute it and/or
# but WITHOUT ANY WARRANTY; without even the implied warranty of # modify it under the terms of the GNU Lesser General Public
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # License as published by the Free Software Foundation; either
# GNU Affero General Public License for more details. # version 2.1 of the License, or (at your option) any later version.
# #
# You should have received a copy of the GNU Affero General Public License # This library is distributed in the hope that it will be useful,
# along with this program. If not, see <http://www.gnu.org/licenses/>. # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
############################################################################## ##############################################################################