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

[IMP]GOLEM Family report : add family info on main card report

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2018-03-18 10:12:56 +01:00
parent 39256ec70d
commit 1948f16110
4 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_family/__manifest__.py
View File

@ -18,7 +18,7 @@
{ {
'name': 'GOLEM families', 'name': 'GOLEM families',
'summary': 'GOLEM Members Families', 'summary': 'GOLEM Members Families',
'version': '10.0.2.1.1', 'version': '10.0.2.2.0',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois', 'author': 'Fabien Bourgeois',
'license': 'AGPL-3', 'license': 'AGPL-3',

38
golem_family/report/golem_member_card_templates.xml
View File

@ -38,26 +38,30 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<t t-foreach="docs" t-as="o"> <t t-foreach="docs" t-as="o">
<div class="oe_structure"/> <div class="oe_structure"/>
<div class="row"> <div class="row">
<h2>Family <span t-field="o.name" /></h2> <div class="col-xs-12">
</div> <h2 class="golem_report_title">
<div class="row"> Family <span t-field="o.name" />
</h2>
</div>
<div class="col-xs-6"> <div class="col-xs-6">
<h3>Details</h3> <h3>Details</h3>
<t if="o.city"> <t if="o.city">
Address : <address>
<span t-field="o.street" /><br /> <strong>Address</strong> :
<t t-if="o.street2"> <span t-field="o.street" /><br />
<span t-field="o.street2" /><br /> <t t-if="o.street2">
</t> <span t-field="o.street2" /><br />
<span t-field="o.zip" /> </t>
<span t-field="o.city" /><br /><br /> <span t-field="o.zip" />
<span t-field="o.city" /><br />
</address>
</t> </t>
<t t-if="o.state_id"> <t t-if="o.state_id">
State : <strong>State</strong> :
<span t-field="o.state_id" /><br /> <span t-field="o.state_id" /><br />
</t> </t>
<t t-if="o.country_id"> <t t-if="o.country_id">
Country : <strong>Country</strong> :
<span t-field="o.country_id" /> <span t-field="o.country_id" />
</t> </t>
</div> </div>
@ -90,7 +94,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</t> </t>
</template> </template>
<template id="golem_member_card_template_inherit_golem_family"
inherit_id="golem_member.golem_member_card_template">
<xpath expr="//div[@id='season_info']" position="before">
<div class="col-xs-12 text-right" id="family_info" t-if="member.family_id">
<strong>Family </strong> <span t-field="member.family_id.name" />
<t t-if="member.family_role">(<em t-field="member.family_role.name" />)</t>
</div>
</xpath>
</template>
</odoo> </odoo>

2
golem_member/__manifest__.py
View File

@ -19,7 +19,7 @@
{ {
'name': 'GOLEM non-profit members', 'name': 'GOLEM non-profit members',
'summary': 'Extends Odoo contacts for MJC', 'summary': 'Extends Odoo contacts for MJC',
'version': '10.0.1.1.3', 'version': '10.0.1.1.4',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne', 'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3', 'license': 'AGPL-3',

9
golem_member/report/golem_member_card_templates.xml
View File

@ -38,18 +38,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<t t-call="report.external_layout"> <t t-call="report.external_layout">
<div id='page_report_member' class="page"> <div id='page_report_member' class="page">
<div class="row"> <div class="row">
<div class="col-xs-6"> <div class="col-xs-12" id="member_title">
<h2> <h2 class="golem_report_title">
<span t-field="member.name" /> <span t-field="member.name" />
<small>(num. <span t-field="member.number" />)</small> <small>(num. <span t-field="member.number" />)</small>
</h2> </h2>
</div> </div>
<div class="col-xs-6"> <div class="col-xs-12" id="season_info">
<h3> <h3 class="text-right" style="margin-top: 0;">
Season : Season :
<span t-field="season.name" /> <span t-field="season.name" />
<t t-if="season.date_start"> <t t-if="season.date_start">
<br />
<small>Period : <small>Period :
<span t-field="season.date_start" /> - <span t-field="season.date_start" /> -
<span t-field="season.date_end" /> <span t-field="season.date_end" />