diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml index 3e58501..a7f03ce 100644 --- a/golem_activity_registration_state/report/golem_member_report.xml +++ b/golem_activity_registration_state/report/golem_member_report.xml @@ -20,22 +20,103 @@ along with this program. If not, see . - - diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml index ca1084c..bc6d68a 100644 --- a/golem_member/report/golem_member_report.xml +++ b/golem_member/report/golem_member_report.xml @@ -22,17 +22,17 @@ along with this program. If not, see . - European A4 Landscape + European A4 Portrait A4 0 0 - Landscape + Portrait 40 23 7 7 - + 35 90 @@ -40,85 +40,84 @@ along with this program. If not, see . - - diff --git a/golem_membership/__manifest__.py b/golem_membership/__manifest__.py index b8e1b0e..890b068 100644 --- a/golem_membership/__manifest__.py +++ b/golem_membership/__manifest__.py @@ -26,5 +26,6 @@ 'installable': True, 'depends': ['golem_member', 'account', 'decimal_precision'], 'data': ['views/golem_membership_invoice.xml', - 'views/golem_member_view.xml'] + 'views/golem_member_view.xml', + 'report/golem_member_report.xml'] } diff --git a/golem_membership/report/__init__.py b/golem_membership/report/__init__.py new file mode 100644 index 0000000..2f46d25 --- /dev/null +++ b/golem_membership/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_membership diff --git a/golem_membership/report/golem_member_report.xml b/golem_membership/report/golem_member_report.xml new file mode 100644 index 0000000..6d85d6f --- /dev/null +++ b/golem_membership/report/golem_member_report.xml @@ -0,0 +1,63 @@ + + + + + + + + +