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

[REF][FIX]GOLEM Member card membership section

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2018-03-08 14:56:34 +01:00
parent 8ee4aca5f4
commit 9898a98da1
2 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_membership/__manifest__.py
View File

@ -18,7 +18,7 @@
{ {
'name': 'GOLEM non-profit membership handling', 'name': 'GOLEM non-profit membership handling',
'summary': 'Extends Odoo membership', 'summary': 'Extends Odoo membership',
'version': '10.0.1.1.0', 'version': '10.0.1.1.1',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne', 'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3', 'license': 'AGPL-3',

39
golem_membership/report/golem_member_report.xml
View File

@ -20,44 +20,49 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<odoo> <odoo>
<template id="membership" inherit_id="golem_member.golem_member_card_template"> <template id="golem_member_card_template_inherit_golem_membership"
inherit_id="golem_member.golem_member_card_template">
<xpath expr="//div[@id='page_report_member']" position="after"> <xpath expr="//div[@id='page_report_member']" position="after">
<t t-call="report.external_layout">
<div class="page"> <div class="page">
<div class="row">
<h2>Membership</h2>
</div>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<strong>Membership</strong>
<tr> <tr>
<th>Season date</th>
<th>Registration</th> <th>Registration</th>
<th>Registration type</th> <th>Registration date</th>
<th>Date from</th>
<th>Date to</th>
<th>State</th> <th>State</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<t t-foreach="docs" t-as="o"> <t t-foreach="docs" t-as="member">
<t t-foreach="member.member_lines" t-as="mline">
<tr> <tr>
<td class="col-xs-3"> <td class="col-xs-3">
<spam t-field="o.membership_start" /> <spam t-field="mline.membership_id" />
<spam t-field="o.membership_stop" /> </td>
<td class="col-xs-2">
<spam t-field="mline.date_from" />
</td>
<td class="col-xs-2">
<spam t-field="mline.date_to" />
</td>
<td class="col-xs-2">
<spam t-field="mline.date" />
</td> </td>
<td class="col-xs-3"> <td class="col-xs-3">
<spam t-field="o.member_lines[0].date" /> <spam t-field="mline.state" />
</td>
<td class="col-xs-3">
<spam t-field="o.member_lines[0].membership_id" />
</td>
<td class="col-xs-3">
<spam t-field="o.membership_state" />
</td> </td>
</tr> </tr>
</t> </t>
</t>
</tbody> </tbody>
</table> </table>
</div> </div>
</t>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>