diff --git a/golem_activity_registration_state/__manifest__.py b/golem_activity_registration_state/__manifest__.py index e8f02db..3b1d05f 100644 --- a/golem_activity_registration_state/__manifest__.py +++ b/golem_activity_registration_state/__manifest__.py @@ -27,5 +27,6 @@ 'depends': ['golem_activity_registration', 'golem_payment'], 'data': ['views/golem_activity_registration_views.xml', 'views/golem_member_views.xml', 'views/golem_activity_views.xml', - 'wizard/golem_activity_registration_invoicing.xml'] + 'wizard/golem_activity_registration_invoicing.xml', + 'report/golem_member_report.xml'] } diff --git a/golem_activity_registration_state/report/__init__.py b/golem_activity_registration_state/report/__init__.py new file mode 100644 index 0000000..cf00e58 --- /dev/null +++ b/golem_activity_registration_state/report/__init__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +# Copyright 2016 Fabien Bourgeois +# Copyright 2018 Michel Dessenne + +# 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 . + +from . import golem_activity_registration diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml new file mode 100644 index 0000000..3e58501 --- /dev/null +++ b/golem_activity_registration_state/report/golem_member_report.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + diff --git a/golem_member/__manifest__.py b/golem_member/__manifest__.py index a9c06cd..4b27ac5 100644 --- a/golem_member/__manifest__.py +++ b/golem_member/__manifest__.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # Copyright 2016 Fabien Bourgeois -# +# Copyright 2018 Michel Dessenne + # 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 @@ -18,9 +19,9 @@ { 'name': 'GOLEM non-profit members', 'summary': 'Extends Odoo contacts for MJC', - 'version': '10.0.1.0.0', + 'version': '10.0.1.1.0', 'category': 'GOLEM', - 'author': 'Fabien Bourgeois', + 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', 'application': True, 'installable': True, @@ -30,5 +31,6 @@ 'views/res_partner_views.xml', 'views/golem_member_numberconfig_views.xml', 'data/golem_member_numberconfig_data.xml', + 'report/golem_member_report.xml', 'security/ir.model.access.csv'] } diff --git a/golem_member/report/__init__.py b/golem_member/report/__init__.py new file mode 100644 index 0000000..6515d8f --- /dev/null +++ b/golem_member/report/__init__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +# Copyright 2016 Fabien Bourgeois +# Copyright 2018 Michel Dessenne + +# 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 . + +from . import golem_member diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml new file mode 100644 index 0000000..ca1084c --- /dev/null +++ b/golem_member/report/golem_member_report.xml @@ -0,0 +1,124 @@ + + + + + + + + European A4 Landscape + + A4 + 0 + 0 + Landscape + 40 + 23 + 7 + 7 + + 35 + 90 + + + + + + + + +