Yaltik
/
golem
1
0
Fork 2
Code Issues Pull Requests 4 Releases Activity

[IMP]GOLEM Activity Registration : member card activities with less columns

This commit is contained in:
Fabien BOURGEOIS 2018-08-02 18:32:30 +02:00
parent 7b022c6623
commit cce4cbccfc
4 changed files with 28 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_activity_registration/__manifest__.py
View File

@ -18,7 +18,7 @@
{
'name': 'GOLEM Activity Member Registrations',
'summary': 'GOLEM Activities Member Registrations management',
'version': '10.0.1.4.1',
'version': '10.0.1.4.2',
'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3',

22
golem_activity_registration/i18n/fr.po
View File

@ -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:12+0200\n"
"POT-Creation-Date: 2018-08-02 16:31+0000\n"
"PO-Revision-Date: 2018-08-02 18:32+0200\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -98,13 +98,8 @@ msgstr "Créé le"
#. 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"
msgid "Dates"
msgstr "Dates"
#. module: golem_activity_registration
#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration
@ -158,13 +153,8 @@ 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"
msgid "Hours"
msgstr "Horaires"
#. module: golem_activity_registration
#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_id

18
golem_activity_registration/i18n/golem_activity_registration.pot
View File

@ -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"
@ -98,12 +98,7 @@ 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"
msgid "Dates"
msgstr ""
#. module: golem_activity_registration
@ -158,12 +153,7 @@ 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"
msgid "Hours"
msgstr ""
#. module: golem_activity_registration

40
golem_activity_registration/report/golem_member_card_templates.xml
View File

@ -31,43 +31,37 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<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>
<th class="text-right">Hours</th>
<th class="text-right">Dates</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" />
<tr t-foreach="member.activity_registration_ids" t-as="reg">
<td>
<span t-field="reg.activity_id.name" />
</td>
<td class="col-xs-2">
<span t-esc="reg.activity_id.type_id.name" />
<td>
<span t-field="reg.activity_id.type_id.name" />
</td>
<td class="col-xs-2">
<td>
<span t-field="reg.activity_id.animator_id" />
</td>
<td class="col-xs-2">
<td>
<span t-field="reg.activity_id.weekday" />
</td>
<td class="col-xs-1">
<td class="text-right">
<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 class="text-right">
<span t-if="reg.activity_id.is_fullseason" t-field="season.date_start" />
<span t-else="" t-field="reg.activity_id.date_start" />
-
<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>