diff --git a/golem_activity_registration/__manifest__.py b/golem_activity_registration/__manifest__.py index f0b6340..c52a436 100644 --- a/golem_activity_registration/__manifest__.py +++ b/golem_activity_registration/__manifest__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2017 Fabien Bourgeois +# Copyright 2017-2018 Fabien Bourgeois # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -18,7 +18,7 @@ { 'name': 'GOLEM Activity Member Registrations', 'summary': 'GOLEM Activities Member Registrations management', - 'version': '10.0.1.1.0', + 'version': '10.0.1.1.1', 'category': 'GOLEM', 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', @@ -26,6 +26,8 @@ 'installable': True, 'depends': ['golem_activity', 'golem_member'], 'data': ['views/golem_activity_registration_views.xml', - 'views/golem_member_views.xml', 'views/golem_activity_views.xml', + 'views/golem_member_views.xml', + 'views/golem_activity_views.xml', + 'report/golem_member_card_templates.xml', 'security/ir.model.access.csv'] } diff --git a/golem_activity_registration/i18n/fr.po b/golem_activity_registration/i18n/fr.po index 055b6b4..6c9af64 100644 --- a/golem_activity_registration/i18n/fr.po +++ b/golem_activity_registration/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: 2017-06-14 23:16+0000\n" -"PO-Revision-Date: 2017-06-28 17:30+0000\n" +"POT-Creation-Date: 2018-03-17 14:18+0000\n" +"PO-Revision-Date: 2018-03-17 14:18+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,6 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration #: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_form_inherit_golem_activity_registration msgid "Activities" msgstr "Activités" @@ -36,6 +37,11 @@ msgstr "Inscriptions" msgid "All activities" msgstr "Toutes les activités" +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Animator" +msgstr "Intervenant" + #. module: golem_activity_registration #: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_form_inherit_golem_activity_registration msgid "Base price" @@ -71,6 +77,21 @@ msgstr "Activités de la saison affichée par défaut" msgid "Current season?" msgstr "Saison en cours?" +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Date start" +msgstr "Début" + +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Date stop" +msgstr "Fin" + +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Day" +msgstr "Jour" + #. module: golem_activity_registration #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_search msgid "Default season" @@ -106,6 +127,16 @@ msgstr "Liste des inscriptions aux activités" msgid "GOLEM Member" msgstr "Adhérent" +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Hour start" +msgstr "Début" + +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Hour stop" +msgstr "Fin" + #. module: golem_activity_registration #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_id msgid "ID" @@ -137,6 +168,11 @@ msgstr "Adhérent" msgid "Members" msgstr "Adhérents" +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Name" +msgstr "Nom" + #. module: golem_activity_registration #: code:addons/golem_activity_registration/models/golem_activity_registration.py:38 #: sql_constraint:golem.activity:0 @@ -186,13 +222,13 @@ msgid "Subscription" msgstr "Inscription" #. module: golem_activity_registration -#: code:addons/golem_activity_registration/models/golem_activity_registration.py:98 +#: code:addons/golem_activity_registration/models/golem_activity_registration.py:99 #, python-format msgid "Subscription can not be executed : the targeted member is not on the same season as the activity." msgstr "L'inscription n'a pas pu être enregistrée : l'usager visé n'est pas ahdérant pour la même saison que celle pendant laquelle se déroule l'activité." #. module: golem_activity_registration -#: code:addons/golem_activity_registration/models/golem_activity_registration.py:90 +#: code:addons/golem_activity_registration/models/golem_activity_registration.py:91 #: sql_constraint:golem.activity.registration:0 #, python-format msgid "This member has already been registered for this activity." @@ -203,3 +239,7 @@ msgstr "L'usager a déjà été inscrit à cette activité." msgid "Total" msgstr "Total" +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Type" +msgstr "Type" diff --git a/golem_activity_registration/i18n/golem_activity_registration.pot b/golem_activity_registration/i18n/golem_activity_registration.pot index a2570ec..8fbccb3 100644 --- a/golem_activity_registration/i18n/golem_activity_registration.pot +++ b/golem_activity_registration/i18n/golem_activity_registration.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-09 15:14+0000\n" -"PO-Revision-Date: 2018-01-09 15:14+0000\n" +"POT-Creation-Date: 2018-03-17 14:18+0000\n" +"PO-Revision-Date: 2018-03-17 14:18+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,6 +16,7 @@ msgstr "" "Plural-Forms: \n" #. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration #: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_form_inherit_golem_activity_registration msgid "Activities" msgstr "" @@ -35,6 +36,11 @@ msgstr "" msgid "All activities" msgstr "" +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Animator" +msgstr "" + #. module: golem_activity_registration #: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_form_inherit_golem_activity_registration msgid "Base price" @@ -70,6 +76,21 @@ msgstr "" msgid "Current season?" msgstr "" +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Date start" +msgstr "" + +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Date stop" +msgstr "" + +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Day" +msgstr "" + #. module: golem_activity_registration #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_search msgid "Default season" @@ -105,6 +126,16 @@ msgstr "" msgid "GOLEM Member" msgstr "" +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Hour start" +msgstr "" + +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Hour stop" +msgstr "" + #. module: golem_activity_registration #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_id msgid "ID" @@ -136,6 +167,11 @@ msgstr "" msgid "Members" msgstr "" +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Name" +msgstr "" + #. module: golem_activity_registration #: code:addons/golem_activity_registration/models/golem_activity_registration.py:38 #: sql_constraint:golem.activity:0 @@ -185,13 +221,13 @@ msgid "Subscription" msgstr "" #. module: golem_activity_registration -#: code:addons/golem_activity_registration/models/golem_activity_registration.py:98 +#: code:addons/golem_activity_registration/models/golem_activity_registration.py:99 #, python-format msgid "Subscription can not be executed : the targeted member is not on the same season as the activity." msgstr "" #. module: golem_activity_registration -#: code:addons/golem_activity_registration/models/golem_activity_registration.py:90 +#: code:addons/golem_activity_registration/models/golem_activity_registration.py:91 #: sql_constraint:golem.activity.registration:0 #, python-format msgid "This member has already been registered for this activity." @@ -202,3 +238,8 @@ msgstr "" msgid "Total" msgstr "" +#. module: golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration +msgid "Type" +msgstr "" + diff --git a/golem_activity_registration/report/golem_member_card_templates.xml b/golem_activity_registration/report/golem_member_card_templates.xml new file mode 100644 index 0000000..4fa873b --- /dev/null +++ b/golem_activity_registration/report/golem_member_card_templates.xml @@ -0,0 +1,76 @@ + + + + + + + + + diff --git a/golem_member/__manifest__.py b/golem_member/__manifest__.py index a43e01d..1c18d2d 100644 --- a/golem_member/__manifest__.py +++ b/golem_member/__manifest__.py @@ -19,7 +19,7 @@ { 'name': 'GOLEM non-profit members', 'summary': 'Extends Odoo contacts for MJC', - 'version': '10.0.1.1.2', + 'version': '10.0.1.1.3', 'category': 'GOLEM', 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', @@ -30,7 +30,7 @@ 'data': ['views/golem_member_views.xml', 'views/res_partner_views.xml', 'views/golem_member_numberconfig_views.xml', - 'views/report_golem_member.xml', + 'report/golem_member_card_templates.xml', 'data/golem_member_numberconfig_data.xml', 'security/ir.model.access.csv'] } diff --git a/golem_member/views/report_golem_member.xml b/golem_member/report/golem_member_card_templates.xml similarity index 52% rename from golem_member/views/report_golem_member.xml rename to golem_member/report/golem_member_card_templates.xml index 367bd52..572175d 100644 --- a/golem_member/views/report_golem_member.xml +++ b/golem_member/report/golem_member_card_templates.xml @@ -30,7 +30,7 @@ along with this program. If not, see . name="golem_member.golem_member_card_template" file="golem_member.golem_member_card_template" attachment="(object.name + '.html')" /> - +