From cd4c0fc872a5bed5e8049e3b6f4629b398c85684 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Thu, 2 Aug 2018 18:34:02 +0200 Subject: [PATCH] [ADD]GOLEM Activity Registration State : state on member card report --- .../__manifest__.py | 5 +- golem_activity_registration_state/i18n/fr.po | 15 ++- .../golem_activity_registration_state.pot | 15 ++- .../report/__init__.py | 19 --- .../report/golem_member_card_templates.xml | 35 +++++ .../report/golem_member_report.xml | 122 ------------------ 6 files changed, 54 insertions(+), 157 deletions(-) delete mode 100644 golem_activity_registration_state/report/__init__.py create mode 100644 golem_activity_registration_state/report/golem_member_card_templates.xml delete mode 100644 golem_activity_registration_state/report/golem_member_report.xml diff --git a/golem_activity_registration_state/__manifest__.py b/golem_activity_registration_state/__manifest__.py index 97f6471..87d50aa 100644 --- a/golem_activity_registration_state/__manifest__.py +++ b/golem_activity_registration_state/__manifest__.py @@ -19,7 +19,7 @@ 'name': 'GOLEM Activity Session Member Registrations States', 'summary': 'GOLEM Activities Session Member Registration states', 'description': 'GOLEM Activities Session Member Registration states', - 'version': '10.0.2.1.0', + 'version': '10.0.2.2.0', 'category': 'GOLEM', 'author': 'Fabien Bourgeois', 'license': 'AGPL-3', @@ -27,5 +27,6 @@ 'installable': True, 'depends': ['golem_activity_registration', 'golem_payment'], 'data': ['views/golem_activity_registration_views.xml', - 'views/golem_member_views.xml'] + 'views/golem_member_views.xml', + 'report/golem_member_card_templates.xml'] } diff --git a/golem_activity_registration_state/i18n/fr.po b/golem_activity_registration_state/i18n/fr.po index 9b72fbe..4b41eda 100644 --- a/golem_activity_registration_state/i18n/fr.po +++ b/golem_activity_registration_state/i18n/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-01 14:09+0000\n" -"PO-Revision-Date: 2018-08-01 16:13+0200\n" +"POT-Creation-Date: 2018-08-02 16:31+0000\n" +"PO-Revision-Date: 2018-08-02 18:33+0200\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -124,11 +124,6 @@ msgstr "If you validate draft registrations, they will be seen as confirmed." msgid "Invoicing id" msgstr "Invoicing id" -#. module: golem_activity_registration_state -#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_journal_id -msgid "Journal" -msgstr "Journal" - #. module: golem_activity_registration_state #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing___last_update #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_line___last_update @@ -145,6 +140,11 @@ msgstr "Adhérent" msgid "Note that you can't register activities if the member is new and not yet saved into the database." msgstr "Notez que vous ne devez d'abord enregistrer la fiche d'un nouvel adhérent avant de pouvoir saisie ses activités." +#. module: golem_activity_registration_state +#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_journal_id +msgid "Payment method" +msgstr "Moyen" + #. module: golem_activity_registration_state #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_schedule_id msgid "Payment schedule" @@ -178,6 +178,7 @@ msgstr "Saison" #. module: golem_activity_registration_state #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_state #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_card_template_inherit_golem_activity_resgitration_state msgid "State" msgstr "État" diff --git a/golem_activity_registration_state/i18n/golem_activity_registration_state.pot b/golem_activity_registration_state/i18n/golem_activity_registration_state.pot index d021a7c..405afde 100644 --- a/golem_activity_registration_state/i18n/golem_activity_registration_state.pot +++ b/golem_activity_registration_state/i18n/golem_activity_registration_state.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-01 14:09+0000\n" -"PO-Revision-Date: 2018-08-01 14:09+0000\n" +"POT-Creation-Date: 2018-08-02 16:31+0000\n" +"PO-Revision-Date: 2018-08-02 16:31+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -124,11 +124,6 @@ msgstr "" msgid "Invoicing id" msgstr "" -#. module: golem_activity_registration_state -#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_journal_id -msgid "Journal" -msgstr "" - #. module: golem_activity_registration_state #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing___last_update #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_line___last_update @@ -145,6 +140,11 @@ msgstr "" msgid "Note that you can't register activities if the member is new and not yet saved into the database." msgstr "" +#. module: golem_activity_registration_state +#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_journal_id +msgid "Payment method" +msgstr "" + #. module: golem_activity_registration_state #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_schedule_id msgid "Payment schedule" @@ -178,6 +178,7 @@ msgstr "" #. module: golem_activity_registration_state #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_state #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_card_template_inherit_golem_activity_resgitration_state msgid "State" msgstr "" diff --git a/golem_activity_registration_state/report/__init__.py b/golem_activity_registration_state/report/__init__.py deleted file mode 100644 index cf00e58..0000000 --- a/golem_activity_registration_state/report/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_card_templates.xml b/golem_activity_registration_state/report/golem_member_card_templates.xml new file mode 100644 index 0000000..80e4b50 --- /dev/null +++ b/golem_activity_registration_state/report/golem_member_card_templates.xml @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml deleted file mode 100644 index a7f03ce..0000000 --- a/golem_activity_registration_state/report/golem_member_report.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - -