Account - Invoicing Reports

Merge lp:~camptocamp/account-invoice-report/account-invoice-report-fix-gpl-licence into lp:~account-core-editors/account-invoice-report/7.0

  1. account-invoice-report-fix-gpl-licence
  2. Merge into 7.0
Proposed by Nicolas Bessi - Camptocamp
Status: Merged
Merged at revision: 12
Proposed branch: lp:~camptocamp/account-invoice-report/account-invoice-report-fix-gpl-licence
Merge into: lp:~account-core-editors/account-invoice-report/7.0
Diff against target: 223 lines (+59/-110)
5 files modified
invoice_webkit/__init__.py (+14/-22)
invoice_webkit/__openerp__.py (+14/-22)
invoice_webkit/invoice.py (+14/-23)
invoice_webkit/report/__init__.py (+15/-23)
invoice_webkit/report/account_invoice.py (+2/-20)
To merge this branch: bzr merge lp:~camptocamp/account-invoice-report/account-invoice-report-fix-gpl-licence
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp no test, code review Approve
Review via email: mp+144728@code.launchpad.net

Description of the change

Fix APL -> AGPL + one import style

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

LGTM

review: Approve (no test, code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'invoice_webkit/__init__.py'
--- invoice_webkit/__init__.py 2012-12-18 13:53:45 +0000
+++ invoice_webkit/__init__.py 2013-01-24 15:35:36 +0000
@@ -2,28 +2,20 @@
2##############################################################################2##############################################################################
3#3#
4# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)4# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
5# @author Guewen Baconnier, Bessi Nicolas, Vicent Renaville5# @author Guewen Baconnier, Bessi Nicolas, Vincent Renaville
6#6#
7# WARNING: This program as such is intended to be used by professional7# This program is free software: you can redistribute it and/or modify
8# programmers who take the whole responsability of assessing all potential8# it under the terms of the GNU Affero General Public License as
9# consequences resulting from its eventual inadequacies and bugs9# published by the Free Software Foundation, either version 3 of the
10# End users who are looking for a ready-to-use solution with commercial10# License, or (at your option) any later version.
11# garantees and support are strongly adviced to contract a Free Software11#
12# Service Company12# This program is distributed in the hope that it will be useful,
13#13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# This program is Free Software; you can redistribute it and/or14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# modify it under the terms of the GNU General Public License15# GNU Affero General Public License for more details.
16# as published by the Free Software Foundation; either version 216#
17# of the License, or (at your option) any later version.17# You should have received a copy of the GNU Affero General Public License
18#18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19# This program is distributed in the hope that it will be useful,
20# but WITHOUT ANY WARRANTY; without even the implied warranty of
21# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22# GNU General Public License for more details.
23#
24# You should have received a copy of the GNU General Public License
25# along with this program; if not, write to the Free Software
26# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
27#19#
28##############################################################################20##############################################################################
29from . import invoice21from . import invoice
3022
=== modified file 'invoice_webkit/__openerp__.py'
--- invoice_webkit/__openerp__.py 2012-12-18 14:42:33 +0000
+++ invoice_webkit/__openerp__.py 2013-01-24 15:35:36 +0000
@@ -2,28 +2,20 @@
2##############################################################################2##############################################################################
3#3#
4# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)4# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
5# @author Guewen Baconnier, Bessi Nicolas, Vicent Renaville5# @author Guewen Baconnier, Bessi Nicolas, Vincent Renaville
6#6#
7# WARNING: This program as such is intended to be used by professional7# This program is free software: you can redistribute it and/or modify
8# programmers who take the whole responsability of assessing all potential8# it under the terms of the GNU Affero General Public License as
9# consequences resulting from its eventual inadequacies and bugs9# published by the Free Software Foundation, either version 3 of the
10# End users who are looking for a ready-to-use solution with commercial10# License, or (at your option) any later version.
11# garantees and support are strongly adviced to contract a Free Software11#
12# Service Company12# This program is distributed in the hope that it will be useful,
13#13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# This program is Free Software; you can redistribute it and/or14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# modify it under the terms of the GNU General Public License15# GNU Affero General Public License for more details.
16# as published by the Free Software Foundation; either version 216#
17# of the License, or (at your option) any later version.17# You should have received a copy of the GNU Affero General Public License
18#18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19# This program is distributed in the hope that it will be useful,
20# but WITHOUT ANY WARRANTY; without even the implied warranty of
21# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22# GNU General Public License for more details.
23#
24# You should have received a copy of the GNU General Public License
25# along with this program; if not, write to the Free Software
26# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
27#19#
28##############################################################################20##############################################################################
2921
3022
=== modified file 'invoice_webkit/invoice.py'
--- invoice_webkit/invoice.py 2013-01-15 08:16:58 +0000
+++ invoice_webkit/invoice.py 2013-01-24 15:35:36 +0000
@@ -2,29 +2,20 @@
2##############################################################################2##############################################################################
3#3#
4# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)4# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
5# @author Bessi Nicolas, Vicent Renaville5# @author Bessi Nicolas, Vincent Renaville
6#6#
7# WARNING: This program as such is intended to be used by professional7# This program is free software: you can redistribute it and/or modify
8# programmers who take the whole responsability of assessing all potential8# it under the terms of the GNU Affero General Public License as
9# consequences resulting from its eventual inadequacies and bugs9# published by the Free Software Foundation, either version 3 of the
10# End users who are looking for a ready-to-use solution with commercial10# License, or (at your option) any later version.
11# garantees and support are strongly adviced to contract a Free Software11#
12# Service Company12# This program is distributed in the hope that it will be useful,
13#13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# This program is Free Software; you can redistribute it and/or14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# modify it under the terms of the GNU General Public License15# GNU Affero General Public License for more details.
16# as published by the Free Software Foundation; either version 216#
17# of the License, or (at your option) any later version.17# You should have received a copy of the GNU Affero General Public License
18#18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19# This program is distributed in the hope that it will be useful,
20# but WITHOUT ANY WARRANTY; without even the implied warranty of
21# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22# GNU General Public License for more details.
23#
24# You should have received a copy of the GNU General Public License
25# along with this program; if not, write to the Free Software
26# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
27#
28##############################################################################19##############################################################################
29from openerp.osv.orm import Model, fields20from openerp.osv.orm import Model, fields
3021
3122
=== modified file 'invoice_webkit/report/__init__.py'
--- invoice_webkit/report/__init__.py 2011-12-20 11:28:09 +0000
+++ invoice_webkit/report/__init__.py 2013-01-24 15:35:36 +0000
@@ -2,29 +2,21 @@
2##############################################################################2##############################################################################
3#3#
4# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)4# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
5# @author Guewen Baconnier5# @author Bessi Nicolas, Vincent Renaville
6#6#
7# WARNING: This program as such is intended to be used by professional7# This program is free software: you can redistribute it and/or modify
8# programmers who take the whole responsability of assessing all potential8# it under the terms of the GNU Affero General Public License as
9# consequences resulting from its eventual inadequacies and bugs9# published by the Free Software Foundation, either version 3 of the
10# End users who are looking for a ready-to-use solution with commercial10# License, or (at your option) any later version.
11# garantees and support are strongly adviced to contract a Free Software11#
12# Service Company12# This program is distributed in the hope that it will be useful,
13#13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# This program is Free Software; you can redistribute it and/or14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# modify it under the terms of the GNU General Public License15# GNU Affero General Public License for more details.
16# as published by the Free Software Foundation; either version 216#
17# of the License, or (at your option) any later version.17# You should have received a copy of the GNU Affero General Public License
18#18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19# This program is distributed in the hope that it will be useful,
20# but WITHOUT ANY WARRANTY; without even the implied warranty of
21# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22# GNU General Public License for more details.
23#
24# You should have received a copy of the GNU General Public License
25# along with this program; if not, write to the Free Software
26# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
27#19#
28##############################################################################20##############################################################################
2921
30import account_invoice22from . import account_invoice
3123
=== modified file 'invoice_webkit/report/account_invoice.py'
--- invoice_webkit/report/account_invoice.py 2012-12-18 16:24:39 +0000
+++ invoice_webkit/report/account_invoice.py 2013-01-24 15:35:36 +0000
@@ -4,26 +4,8 @@
4# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)4# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
5# @author Guewen Baconnier, Vincent Renaville, Nicolas Bessi5# @author Guewen Baconnier, Vincent Renaville, Nicolas Bessi
6#6#
7# WARNING: This program as such is intended to be used by professional7# @author Bessi Nicolas, Vincent Renaville
8# programmers who take the whole responsability of assessing all potential8#
9# consequences resulting from its eventual inadequacies and bugs
10# End users who are looking for a ready-to-use solution with commercial
11# garantees and support are strongly adviced to contract a Free Software
12# Service Company
13#
14# This program is Free Software; you can redistribute it and/or
15# modify it under the terms of the GNU General Public License
16# as published by the Free Software Foundation; either version 2
17# of the License, or (at your option) any later version.
18#
19# This program is distributed in the hope that it will be useful,
20# but WITHOUT ANY WARRANTY; without even the implied warranty of
21# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22# GNU General Public License for more details.
23#
24# You should have received a copy of the GNU General Public License
25# along with this program; if not, write to the Free Software
26# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
27#9#
28##############################################################################10##############################################################################
29import time11import time

Subscribers

People subscribed via source and target branches