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 +68 -58
3 changed files with 68 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f02a2eb912 - Show all commits

56
golem_activity_registration_state/report/golem_member_report.xml
View File

@ -60,9 +60,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</xpath> </xpath>
<xpath expr="//table[@id='table_activity_ref']" position="after"> <xpath expr="//table[@id='table_activity_ref']" position="after">
<table class="table"> <table class="table table-striped">
<thead> <thead>
<strong>Invoices</strong> <strong>Invoices</strong>
<br></br>
<tr> <tr>
<th>Activity</th> <th>Activity</th>
<th>Date</th> <th>Date</th>
@ -91,33 +92,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</t> </t>
</tbody> </tbody>
</table> </table>
<table class="table table-striped"> <table class="table table-striped" >
<thead> <thead>
<strong>Payments</strong> <strong>Payments</strong>
<tr> <br></br>
<th>Invoice number</th> <tr>
<th>State</th> <th>Invoice number</th>
</tr> <th>State</th>
</thead>
<tbody>
<t t-foreach="docs" t-as="o">
<tr t-foreach="o.activity_registration_ids" t-as="l">
<tr>
<td class="col-xs-6">
<spam t-field="l.invoice_id.number" />
</td>
<td class="col-xs-6">
<p t-foreach = "l.invoice_id.payment_ids" t-as = "i" >
<t t-if = "i.state not in ['draft']">
<span t-esc = "i.state" />
</t>
</p>
</td>
</tr>
</tr> </tr>
</t> </thead>
</tbody> <tbody>
</table> <t t-foreach="docs" t-as="o">
<tr t-foreach="o.activity_registration_ids" t-as="l">
<tr>
<td class="col-xs-6">
<spam t-field="l.invoice_id.number" />
</td>
<td class="col-xs-6">
<p t-foreach="l.invoice_id.payment_ids" t-as = "i" >
<t t-if="i.state not in ['draft']">
<span t-esc="i.state" />
</t>
</p>
</td>
</tr>
</tr>
</t>
</tbody>
</table>
</xpath> </xpath>
</template> </template>

11
golem_member/report/golem_member_report.xml
View File

@ -22,17 +22,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<record id="paperformat_euro_landscape" <record id="paperformat_euro_landscape"
model="report.paperformat"> model="report.paperformat">
<field name="name">European A4 Landscape</field> <field name="name">European A4 Portrait</field>
<field name="default" eval="True" /> <field name="default" eval="True" />
<field name="format">A4</field> <field name="format">A4</field>
<field name="page_height">0</field> <field name="page_height">0</field>
<field name="page_width">0</field> <field name="page_width">0</field>
<field name="orientation">Landscape</field> <field name="orientation">Portrait</field>
<field name="margin_top">40</field> <field name="margin_top">40</field>
<field name="margin_bottom">23</field> <field name="margin_bottom">23</field>
<field name="margin_left">7</field> <field name="margin_left">7</field>
<field name="margin_right">7</field> <field name="margin_right">7</field>
<field name="header_line" eval="False" /> <field name="header_line" eval="True" />
<field name="header_spacing">35</field> <field name="header_spacing">35</field>
<field name="dpi">90</field> <field name="dpi">90</field>
</record> </record>
@ -40,7 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<report id="golem_member_report" <report id="golem_member_report"
string="Golem member report" string="Golem member report"
model="golem.member" model="golem.member"
report_type="qweb-html" report_type="qweb-pdf"
name="golem_member.report_golem_member_template" /> name="golem_member.report_golem_member_template" />
<template id="report_golem_member_template"> <template id="report_golem_member_template">
@ -68,6 +68,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<span t-field="o.season_ids[0].date_start" /> <span t-field="o.season_ids[0].date_start" />
- -
<span t-field="o.season_ids[0].date_end" /> <span t-field="o.season_ids[0].date_end" />
<br></br>
<br></br>
</div> </div>
</div> </div>
</t> </t>
@ -75,6 +77,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<table id="table_activity_ref" class="table table-striped"> <table id="table_activity_ref" class="table table-striped">
<thead> <thead>
<strong>Activity</strong> <strong>Activity</strong>
<br></br>
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Animator</th> <th>Animator</th>

59
golem_membership/report/golem_member_report.xml
View File

@ -22,35 +22,40 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<template id="membership" inherit_id="golem_member.report_golem_member_template"> <template id="membership" inherit_id="golem_member.report_golem_member_template">
<xpath expr="//div[@id='page_report_member']" position="after"> <xpath expr="//div[@id='page_report_member']" position="after">
<div class="page"> <t t-call="report.external_layout">
<table class="table"> <div class="page">
<thead> <table class="table table-striped">
<strong>Membership</strong> <thead>
<tr> <strong>Membership</strong>
<th>Season</th>
<th>Date</th>
<th>State</th>
</tr>
</thead>
<tbody>
<t t-foreach="docs" t-as="o">
<tr> <tr>
<td class="col-xs-4"> <th>Season date</th>
<spam t-field="o.member_lines.date" /> <th>Registration</th>
</td> <th>Registration type</th>
<td class="col-xs-4"> <th>State</th>
<spam t-field="o.member_lines.membership_id" />
</td>
<td class="col-xs-4">
<spam t-field="o.member_lines.state" />
</td>
</tr> </tr>
</t> </thead>
</tbody> <tbody>
</table> <t t-foreach="docs" t-as="o">
<tr>
<td class="col-xs-3">
</div> <spam t-field="o.membership_start" />
<spam t-field="o.membership_stop" />
</td>
<td class="col-xs-3">
<spam t-field="o.member_lines.date" />
</td>
<td class="col-xs-3">
<spam t-field="o.member_lines.membership_id" />
</td>
<td class="col-xs-3">
<spam t-field="o.membership_state" />
</td>
</tr>
</t>
</tbody>
</table>
</div>
</t>
</xpath> </xpath>
</template> </template>