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

32
golem_activity_registration_state/report/golem_member_report.xml
View File

@ -26,10 +26,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<th>Price</th> <th>Price</th>
</xpath> </xpath>
<xpath expr="//td[@id='activity_inherit_td']" position="after"> <xpath expr="//td[@id='activity_inherit_td']" position="after">
<td class="col-xs-6"> <td class="col-xs-4">
<span t-field="t.state" /> <span t-field="t.state" />
</td> </td>
<td class="col-xs-6"> <td class="col-xs-4">
<span t-field="t.activity_price" t-field-options="{'widget': 'monetary', <span t-field="t.activity_price" t-field-options="{'widget': 'monetary',
'display_currency': o.currency_id}"/> 'display_currency': o.currency_id}"/>
</td> </td>
@ -37,19 +37,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<xpath expr="//tr[@id='activity_inherit_price_sum']" position="before"> <xpath expr="//tr[@id='activity_inherit_price_sum']" position="before">
<t t-set="price_sum" t-value="0"/> <t t-set="price_sum" t-value="0"/>
</xpath> </xpath>
<xpath expr="//tr[@id='activity_inherit_sum']" position="inside"> <xpath expr="//tr[@id='activity_inherit_price_sum']" position="inside">
<t t-set="price_sum" t-value="price_sum + t.activity_price"/> <t t-set="price_sum" t-value="price_sum + t.activity_price"/>
</xpath> </xpath>
<xpath expr="//tr[@id='activity_inherit_total']" position="replace"> <xpath expr="//tr[@id='activity_inherit_total']" position="replace">
<tfoot> <tfoot>
<tr> <tr>
<td><td><td><td><td><td><td> <td><td><td><td><td><td><td>
<td class="col-xs-6"> <td>
<strong> <strong>
TOTAL TOTAL
</strong> </strong>
</td> </td>
<td class="col-xs-6"> <td>
<t t-esc="price_sum" <t t-esc="price_sum"
t-esc-options="{'widget': 'monetary', t-esc-options="{'widget': 'monetary',
'display_currency': o.currency_id}"/> 'display_currency': o.currency_id}"/>
@ -64,8 +64,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<thead> <thead>
<strong>Invoices</strong> <strong>Invoices</strong>
<tr> <tr>
<th>Date</th>
<th>Number</th> <th>Number</th>
<th>Date</th>
<th>Activity</th> <th>Activity</th>
<th>Amount</th> <th>Amount</th>
<th>State</th> <th>State</th>
@ -76,10 +76,10 @@ 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">
<tr t-foreach="o.activity_registration_ids" t-as="l"> <tr t-foreach="o.activity_registration_ids" t-as="l">
<td class="col-xs-6"> <td class="col-xs-6">
<spam t-field="l.invoice_id.date_invoice" /> <spam t-field="l.invoice_id.number" />
</td> </td>
<td class="col-xs-6"> <td class="col-xs-6">
<spam t-field="l.invoice_id[0].number" /> <spam t-field="l.invoice_id.date_invoice" />
</td> </td>
<td class="col-xs-6"> <td class="col-xs-6">
<spam t-field="l.invoice_line_id.product_id" /> <spam t-field="l.invoice_line_id.product_id" />
@ -101,12 +101,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</t> </t>
</tbody> </tbody>
</table> </table>
<!-- En cours -->
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<strong>Payments</strong>
<tr> <tr>
<th>payment</th> <th>Invoice number</th>
<th>Ref payment</th>
<th>State</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -114,8 +115,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<tr t-foreach="o.activity_registration_ids" t-as="l"> <tr t-foreach="o.activity_registration_ids" t-as="l">
<tr> <tr>
<td> <td>
<spam t-field="o.last_payment_state" /> <spam t-field="l.invoice_id.number" />
</td> </td>
<td>
<spam t-field="l.invoice_id.payment_ids.name" />
</td>
<td>
<spam t-field="l.invoice_id.payment_ids.state" />
</td>
</tr> </tr>
</tr> </tr>
</t> </t>

19
golem_member/report/golem_member_report.xml
View File

@ -58,7 +58,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<tbody> <tbody>
<t t-foreach="docs" t-as="o"> <t t-foreach="docs" t-as="o">
<tr> <tr>
<td class="col-xs-6"> <td class="col-xs-4">
<strong><span t-field="o.name" /></strong><br></br> <strong><span t-field="o.name" /></strong><br></br>
<span t-field="o.street" /><br></br> <span t-field="o.street" /><br></br>
<t t-if="o.street2"> <t t-if="o.street2">
@ -71,10 +71,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</t> </t>
<span t-field="o.country_id" /><br></br> <span t-field="o.country_id" /><br></br>
</td> </td>
<td class="col-xs-6"> <td class="col-xs-4">
<span t-field="o.season_ids[0].name" /><br></br> <span t-field="o.season_ids[0].name" /><br></br>
</td> </td>
<td class="col-xs-6"> <td class="col-xs-4">
<span t-field="o.season_ids[0].date_start" /><br></br> <span t-field="o.season_ids[0].date_start" /><br></br>
<span t-field="o.season_ids[0].date_end" /><br></br> <span t-field="o.season_ids[0].date_end" /><br></br>
</td> </td>
@ -98,28 +98,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<tbody> <tbody>
<t t-foreach="docs" t-as="o"> <t t-foreach="docs" t-as="o">
<tr id="activity_inherit_price_sum" t-foreach="o.activity_registration_ids" t-as="t"> <tr id="activity_inherit_price_sum" t-foreach="o.activity_registration_ids" t-as="t">
<td class="col-xs-6"> <td class="col-xs-4">
<span t-esc="t.activity_id.name" /><br></br> <span t-esc="t.activity_id.name" /><br></br>
</td> </td>
<td class="col-xs-6"> <td class="col-xs-4">
<span t-field="t.activity_id.animator_id" /><br></br> <span t-field="t.activity_id.animator_id" /><br></br>
</td> </td>
<td class="col-xs-6"> <td class="col-xs-4">
<span t-field="t.activity_id.weekday" /><br></br> <span t-field="t.activity_id.weekday" /><br></br>
</td> </td>
<td class="col-xs-6"> <td class="col-xs-4">
<span t-field="t.activity_id.hour_start" /><br></br> <span t-field="t.activity_id.hour_start" /><br></br>
</td> </td>
<td class="col-xs-6"> <td class="col-xs-4">
<span t-field="t.activity_id.hour_stop" /><br></br> <span t-field="t.activity_id.hour_stop" /><br></br>
</td> </td>
<td class="col-xs-6"> <td class="col-xs-4">
<span t-field="t.activity_id.date_start" /><br></br> <span t-field="t.activity_id.date_start" /><br></br>
</td> </td>
<td id="activity_inherit_td"> <td id="activity_inherit_td">
<span t-field="t.activity_id.date_stop" /><br></br> <span t-field="t.activity_id.date_stop" /><br></br>
</td> </td>
<tr id="activity_inherit_sum"></tr>
</tr> </tr>
<tr id="activity_inherit_total"></tr> <tr id="activity_inherit_total"></tr>
</t> </t>