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 +40 -32
2 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0228a3535b - Show all commits

14
golem_activity_registration_state/report/golem_member_report.xml
View File

@ -34,14 +34,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
'display_currency': o.currency_id}"/> 'display_currency': o.currency_id}"/>
</td> </td>
</xpath> </xpath>
<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_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="//tfoot[@id='activity_inherit_total']" position="inside"> <xpath expr="//tfoot[@id='activity_inherit_total']" position="inside">
<tr> <tr>
@ -53,6 +50,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</tr> </tr>
</xpath> </xpath>
<xpath expr="//table[@id='table_activity_ref']" position="after">
<table class="table table-striped">
<t t-foreach="docs" t-as="o">
<tr t-foreach="o.activity_registration_ids" t-as="l">
<td>
<spam t-field="l.invoice_id.number" />
</td>
</tr>
</t>
</table>
</xpath>
</template> </template>
</odoo> </odoo>

4
golem_member/report/golem_member_report.xml
View File

@ -79,7 +79,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</tr> </tr>
</t> </t>
</table> </table>
<table class="table table-striped"> <table id="table_activity_ref" class="table table-striped">
<tr> <tr>
<th>Activity</th> <th>Activity</th>
<th>Animator</th> <th>Animator</th>
@ -114,7 +114,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</td> </td>
<tr id="activity_inherit_sum"></tr> <tr id="activity_inherit_sum"></tr>
</tr> </tr>
<tfoot style="text-align:right" id="activity_inherit_total"></tfoot> <tfoot id="activity_inherit_total"></tfoot>
</t> </t>
</table> </table>