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 +11 -11
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a93c3c0bd - Show all commits

20
golem_activity_registration_state/report/golem_member_report.xml
View File

@ -22,20 +22,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<report id="golem_activity_registration_report"
string="golem_activity_registration report"
model="golem.activity_registration"
model="golem.activity_registration_state"
report_type="qweb-html"
name="golem_activity.report_golem_member_template" />
<template id="activity" inherit_id="golem_member.report_golem_member_template">
<t t-foreach="docs" t-as="o">
<table>
<tr t-foreach="o.member_id" t-as="t">
<xpath expr="//strong" position="replace">
<span t-field="t.name" />
<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>
<h1> tttttttt<span t-esc="activity_id" /></h1>
<!-- <h1> tttttttt<span t-set="state" t-value="activity_registration_ids.state" /></h1> -->
</td>
</xpath>
</tr>
</table>
</t>
</template>
</odoo>

2
golem_member/report/golem_member_report.xml
View File

@ -109,7 +109,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<td class="col-xs-6">
<span t-field="t.activity_id.date_start" /><br></br>
</td>
<td class="col-xs-6">
<td id="place" class="col-xs-6">
<span t-field="t.activity_id.date_stop" /><br></br>
</td>
</tr>