forked from Yaltik/golem
[IMP]GOLEM Activity Registration : no more empty table for activities, invoices payments.
This commit is contained in:
parent
245ef22c80
commit
037a69d09e
@ -18,7 +18,7 @@
|
||||
{
|
||||
'name': 'GOLEM Activity Member Registrations',
|
||||
'summary': 'GOLEM Activities Member Registrations management',
|
||||
'version': '10.0.1.4.2',
|
||||
'version': '10.0.1.4.3',
|
||||
'category': 'GOLEM',
|
||||
'author': 'Fabien Bourgeois, Michel Dessenne',
|
||||
'license': 'AGPL-3',
|
||||
|
||||
@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 10.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2018-08-02 16:31+0000\n"
|
||||
"PO-Revision-Date: 2018-08-02 18:32+0200\n"
|
||||
"POT-Creation-Date: 2018-08-02 16:46+0000\n"
|
||||
"PO-Revision-Date: 2018-08-02 18:47+0200\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -199,6 +199,11 @@ msgstr "Nom"
|
||||
msgid "Number of places cannot be negative."
|
||||
msgstr "Le nombre de places ne peut pas être négatif"
|
||||
|
||||
#. module: golem_activity_registration
|
||||
#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration
|
||||
msgid "On default season, there is no activity for this member."
|
||||
msgstr "Sur la saison par défaut, il n'y a pas d'activité pour cet usager."
|
||||
|
||||
#. module: golem_activity_registration
|
||||
#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_places
|
||||
msgid "Places"
|
||||
|
||||
@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 10.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2018-08-02 16:31+0000\n"
|
||||
"PO-Revision-Date: 2018-08-02 16:31+0000\n"
|
||||
"POT-Creation-Date: 2018-08-02 16:45+0000\n"
|
||||
"PO-Revision-Date: 2018-08-02 16:45+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -199,6 +199,11 @@ msgstr ""
|
||||
msgid "Number of places cannot be negative."
|
||||
msgstr ""
|
||||
|
||||
#. module: golem_activity_registration
|
||||
#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration
|
||||
msgid "On default season, there is no activity for this member."
|
||||
msgstr ""
|
||||
|
||||
#. module: golem_activity_registration
|
||||
#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_places
|
||||
msgid "Places"
|
||||
|
||||
@ -24,7 +24,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
inherit_id="golem_member.golem_member_card_template">
|
||||
<xpath expr="//div[@id='page_report_member']" postion="inside">
|
||||
<h3>Activities</h3>
|
||||
<table id="table_activity_ref" class="table table-striped">
|
||||
<p t-if="not member.activity_registration_ids">
|
||||
On default season, there is no activity for this member.
|
||||
</p>
|
||||
<table t-else="" id="table_activity_ref" class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
'name': 'GOLEM Activity Member Registration Payments',
|
||||
'summary': 'GOLEM Activities Member Registration Payments',
|
||||
'description': 'GOLEM Activities Member Registration Payments',
|
||||
'version': '10.0.0.3.0',
|
||||
'version': '10.0.0.3.1',
|
||||
'category': 'GOLEM',
|
||||
'author': 'Fabien Bourgeois',
|
||||
'license': 'AGPL-3',
|
||||
|
||||
@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 10.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2018-08-02 16:31+0000\n"
|
||||
"PO-Revision-Date: 2018-08-02 18:35+0200\n"
|
||||
"POT-Creation-Date: 2018-08-02 16:45+0000\n"
|
||||
"PO-Revision-Date: 2018-08-02 18:47+0200\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -213,6 +213,16 @@ msgstr "Dernière mise à jour le"
|
||||
msgid "Method"
|
||||
msgstr "Moyen"
|
||||
|
||||
#. module: golem_activity_registration_payment
|
||||
#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_member_card_template_inherit_golem_activity_resgitration_payment
|
||||
msgid "On default season, there is no activity linked invoice for this member."
|
||||
msgstr "Sur la saison par défaut, il n'y a pas de facture liée à une activité pour cet usager."
|
||||
|
||||
#. module: golem_activity_registration_payment
|
||||
#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_member_card_template_inherit_golem_activity_resgitration_payment
|
||||
msgid "On default season, there is no activity linked payment for this member."
|
||||
msgstr "Sur la saison par défaut, il n'y a pas de paiement lié à une activité pour cet usager."
|
||||
|
||||
#. module: golem_activity_registration_payment
|
||||
#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment
|
||||
msgid "Opened Invoice"
|
||||
|
||||
@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 10.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2018-08-02 16:31+0000\n"
|
||||
"PO-Revision-Date: 2018-08-02 16:31+0000\n"
|
||||
"POT-Creation-Date: 2018-08-02 16:45+0000\n"
|
||||
"PO-Revision-Date: 2018-08-02 16:45+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -209,6 +209,16 @@ msgstr ""
|
||||
msgid "Method"
|
||||
msgstr ""
|
||||
|
||||
#. module: golem_activity_registration_payment
|
||||
#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_member_card_template_inherit_golem_activity_resgitration_payment
|
||||
msgid "On default season, there is no activity linked invoice for this member."
|
||||
msgstr ""
|
||||
|
||||
#. module: golem_activity_registration_payment
|
||||
#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_member_card_template_inherit_golem_activity_resgitration_payment
|
||||
msgid "On default season, there is no activity linked payment for this member."
|
||||
msgstr ""
|
||||
|
||||
#. module: golem_activity_registration_payment
|
||||
#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment
|
||||
msgid "Opened Invoice"
|
||||
|
||||
@ -51,7 +51,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<!-- <p style="page-break-before:always;"> </p> -->
|
||||
<div id="page_report_invoicing" class="row">
|
||||
<h3>Invoices</h3>
|
||||
<table id="table_activity_ref" class="table table-striped">
|
||||
<t t-set="invoices" t-value="member.activity_registration_ids.mapped('invoice_line_id.invoice_id')" />
|
||||
<p t-if="not invoices">
|
||||
On default season, there is no activity linked invoice for this member.
|
||||
</p>
|
||||
<table t-else="" id="table_activity_ref" class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Invoice</th>
|
||||
@ -73,7 +77,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</tr>
|
||||
</tfoot>
|
||||
<tbody>
|
||||
<tr t-foreach="member.activity_registration_ids.mapped('invoice_line_id.invoice_id')" t-as="inv">
|
||||
<tr t-foreach="invoices" t-as="inv">
|
||||
<td>
|
||||
<span t-field="inv.display_name" />
|
||||
</td>
|
||||
@ -93,7 +97,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</tbody>
|
||||
</table>
|
||||
<h3>Payments</h3>
|
||||
<table id="table_activity_ref" class="table table-striped">
|
||||
<t t-set="payments" t-value="member.activity_registration_ids.mapped('invoice_line_id.invoice_id.payment_ids')" />
|
||||
<p t-if="not payments">
|
||||
On default season, there is no activity linked payment for this member.
|
||||
</p>
|
||||
<table t-else="" id="table_activity_ref" class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Date</th>
|
||||
@ -102,13 +110,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<th class="text-right">Amount</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<t t-set="invoices" t-value="member.activity_registration_ids.mapped('invoice_line_id.invoice_id')" />
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td class="text-right" colspan="5">
|
||||
<strong>
|
||||
<span style="padding-right: 5px;">Total</span>
|
||||
<span t-esc="sum(invoices.mapped('payment_ids.amount'))"
|
||||
<span t-esc="sum(payments.mapped('amount'))"
|
||||
t-esc-options="{'widget': 'monetary', 'display_currency': member.currency_id}" />
|
||||
</strong>
|
||||
</td>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user