This commit is contained in:
michel 2018-02-20 11:44:48 +01:00
parent 1a71c21e5b
commit 0228a3535b
2 changed files with 40 additions and 32 deletions

View File

@ -21,38 +21,46 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<odoo> <odoo>
<template id="activity" inherit_id="golem_member.report_golem_member_template"> <template id="activity" inherit_id="golem_member.report_golem_member_template">
<xpath expr="//th[@id='activity_inherit_th']" position="after"> <xpath expr="//th[@id='activity_inherit_th']" position="after">
<th>State</th> <th>State</th>
<th>Price</th> <th>Price</th>
</xpath> </xpath>
<xpath expr="//td[@id='activity_inherit_td']" position="after"> <xpath expr="//td[@id='activity_inherit_td']" position="after">
<td>
<span t-field="t.state" />
</td>
<td>
<span t-field="t.activity_price" t-field-options="{'widget': 'monetary',
'display_currency': o.currency_id}"/>
</td>
</xpath>
<xpath expr="//tr[@id='activity_inherit_price_sum']" position="before">
<t t-set="price_sum" t-value="0"/>
</xpath>
<xpath expr="//tr[@id='activity_inherit_sum']" position="inside">
<t t-set="price_sum" t-value="price_sum + t.activity_price"/>
</xpath>
<xpath expr="//tfoot[@id='activity_inherit_total']" position="inside">
<tr>
<td>
<strong>TOTAL=<t t-esc="price_sum"
t-esc-options="{'widget': 'monetary',
'display_currency': o.currency_id}" /></strong>
</td>
</tr>
</xpath>
<xpath expr="//table[@id='table_activity_ref']" position="after">
<table class="table table-striped">
<t t-foreach="docs" t-as="o">
<tr t-foreach="o.activity_registration_ids" t-as="l">
<td> <td>
<span t-field="t.state" /> <spam t-field="l.invoice_id.number" />
</td> </td>
<td> </tr>
<span t-field="t.activity_price" t-field-options="{'widget': 'monetary', </t>
'display_currency': o.currency_id}"/> </table>
</td> </xpath>
</xpath>
<xpath expr="//tr[@id='activity_inherit_price_sum']" position="before">
<t t-set="price_sum" t-value="0"/>
</xpath>
<xpath expr="//tr[@id='activity_inherit_sum']" position="inside">
<t t-set="price_sum" t-value="price_sum + t.activity_price"/>
</xpath>
<xpath expr="//tfoot[@id='activity_inherit_total']" position="inside">
<tr>
<td>
<strong>TOTAL=<t t-esc="price_sum"
t-esc-options="{'widget': 'monetary',
'display_currency': o.currency_id}" /></strong>
</td>
</tr>
</xpath>
</template> </template>
</odoo> </odoo>

View File

@ -79,7 +79,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</tr> </tr>
</t> </t>
</table> </table>
<table class="table table-striped"> <table id="table_activity_ref" class="table table-striped">
<tr> <tr>
<th>Activity</th> <th>Activity</th>
<th>Animator</th> <th>Animator</th>
@ -114,7 +114,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</td> </td>
<tr id="activity_inherit_sum"></tr> <tr id="activity_inherit_sum"></tr>
</tr> </tr>
<tfoot style="text-align:right" id="activity_inherit_total"></tfoot> <tfoot id="activity_inherit_total"></tfoot>
</t> </t>
</table> </table>