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

[TMP] Report Golem_member #9

Manually merged
fabien merged 15 commits from michel/GOLEM:michel_qweb_adherents into master 2018-03-08 16:19:22 +01:00
Conversation 0 Commits 15 Files Changed 5 +28 -13
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f15fcbd222 - Show all commits

36
golem_activity_registration_state/report/golem_member_report.xml
View File

@ -20,19 +20,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<odoo> <odoo>
<report id="golem_activity_registration_report" <template id="activity" inherit_id="golem_member.report_golem_member_template">
string="golem_activity_registration report" <xpath expr="//th[@id='activity_inherit_th']" position="after">
model="golem.activity_registration_state" <th>State</th>
report_type="qweb-html" <th>Price</th>
name="golem_activity.report_golem_member_template" /> </xpath>
<xpath expr="//td[@id='activity_inherit_td']" position="after">
<template id="report_golem_member_template" inherit_id="golem_member.report_golem_member_template">
<xpath expr="//td[@id='place']" position="after">
<!-- <span t-set="name" t-value="activity_id.name"/> -->
<td> <td>
<h1> tttttttt<span t-esc="activity_id" /></h1> <span t-field="t.state" />
</td>
<td>
<span t-field="t.activity_price" />
</td>
</xpath>
<xpath expr="//tr[@id='activity_inherit_total']" position="inside">
<td>
<strong>Total</strong>
<!-- <t t-set="test_variable" t-value="100"/>
<p t-foreach="t.activity_price" t-as="i">
<t t-set="test_variable" t-value="test_variable+i"/>
</p>
<h1>RESULT=<t t-esc="test_variable"/></h1> -->
<!-- <h1> tttttttt<span t-set="state" t-value="activity_registration_ids.state" /></h1> --> <p t-foreach="t.activity_price" t-as="i">
<t t-set="i" t-value="0"/>
<t t-set="price_count" t-value="price_base + i"/>
</p>
<h1>RESULT=<t t-esc="price_count" /></h1>
</td> </td>
</xpath> </xpath>

5
golem_member/report/golem_member_report.xml
View File

@ -87,7 +87,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<th>Hour start</th> <th>Hour start</th>
<th>Hour stop</th> <th>Hour stop</th>
<th>Date start</th> <th>Date start</th>
<th>Date stop</th> <th id="activity_inherit_th">Date stop</th>
</tr> </tr>
<t t-foreach="docs" t-as="o"> <t t-foreach="docs" t-as="o">
<tr t-foreach="o.activity_registration_ids" t-as="t"> <tr t-foreach="o.activity_registration_ids" t-as="t">
@ -109,9 +109,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<td class="col-xs-6"> <td class="col-xs-6">
<span t-field="t.activity_id.date_start" /><br></br> <span t-field="t.activity_id.date_start" /><br></br>
</td> </td>
<td id="place" class="col-xs-6"> <td id="activity_inherit_td" class="col-xs-6">
<span t-field="t.activity_id.date_stop" /><br></br> <span t-field="t.activity_id.date_stop" /><br></br>
</td> </td>
<tr id="activity_inherit_total"></tr>
</tr> </tr>
</t> </t>
</table> </table>