[REF][MOV]GOLEM Member should not contain acitivty registration information, move to right module
This commit is contained in:
parent
8d80c1d5b3
commit
2a3b17d354
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
|
||||
# Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
|
||||
#
|
||||
# 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']
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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 ""
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,76 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
|
||||
Copyright 2018 Michel Dessenne <michel@yaltik.com>
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<template id="golem_member_card_template_inherit_golem_activity_resgitration"
|
||||
inherit_id="golem_member.golem_member_card_template">
|
||||
<xpath expr="//div[@id='page_report_member']/div[1]" postion="after">
|
||||
<h3>Activities</h3>
|
||||
<table id="table_activity_ref" class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Type</th>
|
||||
<th>Animator</th>
|
||||
<th>Day</th>
|
||||
<th>Hour start</th>
|
||||
<th>Hour stop</th>
|
||||
<th>Date start</th>
|
||||
<th id="activity_inherit_th">Date stop</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr id="activity_inherit_price_sum"
|
||||
t-foreach="member.activity_registration_ids" t-as="reg">
|
||||
<td class="col-xs-2">
|
||||
<span t-esc="reg.activity_id.name" />
|
||||
</td>
|
||||
<td class="col-xs-2">
|
||||
<span t-esc="reg.activity_id.type_id.name" />
|
||||
</td>
|
||||
<td class="col-xs-2">
|
||||
<span t-field="reg.activity_id.animator_id" />
|
||||
</td>
|
||||
<td class="col-xs-2">
|
||||
<span t-field="reg.activity_id.weekday" />
|
||||
</td>
|
||||
<td class="col-xs-1">
|
||||
<t t-esc="'%02d:%02d' % (int(reg.activity_id.hour_start), round(reg.activity_id.hour_start % 1 * 60))" />
|
||||
</td>
|
||||
<td class="col-xs-1">
|
||||
<t t-esc="'%02d:%02d' % (int(reg.activity_id.hour_stop), round(reg.activity_id.hour_stop % 1 * 60))" />
|
||||
</td>
|
||||
<td class="col-xs-2">
|
||||
<span t-if="reg.activity_id.is_fullseason" t-field="season.date_start" />
|
||||
<span t-else="" t-field="reg.activity_id.date_start" />
|
||||
</td>
|
||||
<td id="activity_inherit_td">
|
||||
<span t-if="reg.activity_id.is_fullseason" t-field="season.date_end" />
|
||||
<span t-else="" t-field="reg.activity_id.date_stop" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr id="activity_inherit_total" />
|
||||
</tbody>
|
||||
</table>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
</odoo>
|
||||
|
|
@ -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']
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
name="golem_member.golem_member_card_template"
|
||||
file="golem_member.golem_member_card_template"
|
||||
attachment="(object.name + '.html')" />
|
||||
|
||||
|
||||
<template id="golem_member_card_template">
|
||||
<t t-call="report.html_container">
|
||||
<t t-set="season" t-value="docs._default_season()" />
|
||||
|
|
@ -58,53 +58,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
</h3>
|
||||
</div>
|
||||
</div>
|
||||
<h3>Activities</h3>
|
||||
<table id="table_activity_ref" class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Type</th>
|
||||
<th>Animator</th>
|
||||
<th>Day</th>
|
||||
<th>Hour start</th>
|
||||
<th>Hour stop</th>
|
||||
<th>Date start</th>
|
||||
<th id="activity_inherit_th">Date stop</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr id="activity_inherit_price_sum"
|
||||
t-foreach="member.activity_registration_ids" t-as="reg">
|
||||
<td class="col-xs-2">
|
||||
<span t-esc="reg.activity_id.name" />
|
||||
</td>
|
||||
<td class="col-xs-2">
|
||||
<span t-esc="reg.activity_id.type_id.name" />
|
||||
</td>
|
||||
<td class="col-xs-2">
|
||||
<span t-field="reg.activity_id.animator_id" />
|
||||
</td>
|
||||
<td class="col-xs-2">
|
||||
<span t-field="reg.activity_id.weekday" />
|
||||
</td>
|
||||
<td class="col-xs-1">
|
||||
<t t-esc="'%02d:%02d' % (int(reg.activity_id.hour_start), round(reg.activity_id.hour_start % 1 * 60))" />
|
||||
</td>
|
||||
<td class="col-xs-1">
|
||||
<t t-esc="'%02d:%02d' % (int(reg.activity_id.hour_stop), round(reg.activity_id.hour_stop % 1 * 60))" />
|
||||
</td>
|
||||
<td class="col-xs-2">
|
||||
<span t-if="reg.activity_id.is_fullseason" t-field="season.date_start" />
|
||||
<span t-else="" t-field="reg.activity_id.date_start" />
|
||||
</td>
|
||||
<td id="activity_inherit_td">
|
||||
<span t-if="reg.activity_id.is_fullseason" t-field="season.date_end" />
|
||||
<span t-else="" t-field="reg.activity_id.date_stop" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr id="activity_inherit_total"></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</t>
|
||||
</t>
|
||||
Loading…
Reference in New Issue