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

62
golem_activity_registration_state/report/golem_member_report.xml
View File

@ -44,15 +44,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<tfoot>
<tr>
<td><td><td><td><td><td><td>
<td>
<strong>
TOTAL
</strong>
</td>
<td>
<t t-esc="price_sum"
t-esc-options="{'widget': 'monetary',
'display_currency': o.currency_id}"/>
<td>
<strong>
TOTAL
</strong>
</td>
<td>
<t t-esc="price_sum"
t-esc-options="{'widget': 'monetary',
'display_currency': o.currency_id}"/>
</td>
</td></td></td></td></td></td></td>
</tr>
@ -63,7 +63,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<table class="table table-striped">
<thead>
<strong>Invoices</strong>
<br></br>
<tr>
<th>Activity</th>
<th>Date</th>
@ -93,32 +92,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</tbody>
</table>
<table class="table table-striped" >
<thead>
<strong>Payments</strong>
<br></br>
<thead>
<strong>Payments</strong>
<tr>
<th>Invoice number</th>
<th>State</th>
</tr>
</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']">
<th>Invoice number</th>
<th>State</th>
</tr>
</thead>
<tbody>
<t t-foreach="docs" t-as="o">
<tr t-foreach="o.activity_registration_ids" t-as="l">
<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>
</p>
</td>
</tr>
</t>
</tbody>
</table>
</xpath>
</template>

29
golem_member/report/golem_member_report.xml
View File

@ -56,24 +56,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
t-options='{"widget": "contact", "fields":
["address", "name", "street", "street2", "phone", "fax"],
"no_marker": True, "phone_icons": True}'/>
<br></br>
</div>
<div class="oe_structure"/>
<div class="col-xs-4">
<strong>Season :</strong>
<span t-field="o.season_ids[0].name" />
</div>
<div class="oe_structure"/>
<div class="col-xs-4">
<strong>Date :</strong>
<span t-field="o.season_ids[0].date_start" />
-
<span t-field="o.season_ids[0].date_end" />
<br></br>
<br></br>
</div>
<strong>Season :</strong>
<span t-field="o.season_ids[0].name" />
</div>
<div class="col-xs-4">
<strong>Date :</strong>
<span t-field="o.season_ids[0].date_start" />
-
<span t-field="o.season_ids[0].date_end" />
<br></br>
<br></br>
</div>
</div>
</t>
</t>
<table id="table_activity_ref" class="table table-striped">
<thead>
<strong>Activity</strong>
@ -122,5 +120,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</t>
</template>
</odoo>