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 +18 -10
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1a71c21e5b - Show all commits

22
golem_activity_registration_state/report/golem_member_report.xml
View File

@ -30,21 +30,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<span t-field="t.state" /> <span t-field="t.state" />
</td> </td>
<td> <td>
<span t-field="t.activity_price" /> <span t-field="t.activity_price" t-field-options="{'widget': 'monetary',
'display_currency': o.currency_id}"/>
</td> </td>
</xpath> </xpath>
<xpath expr="//t[@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_price_sum']" position="after"> <xpath expr="//tr[@id='activity_inherit_sum']" position="inside">
<t t-set="activity_price" t-value="t.activity_price" />
</xpath>
<xpath expr="//tr[@id='activity_inherit_total']" position="inside">
<td>
<t t-set="price_sum" t-value="price_sum + t.activity_price"/> <t t-set="price_sum" t-value="price_sum + t.activity_price"/>
<h1>TOTAL=<t t-esc="price_sum" /></h1>
</xpath>
<xpath expr="//tfoot[@id='activity_inherit_total']" position="inside">
<tr>
<td>
<strong>TOTAL=<t t-esc="price_sum"
t-esc-options="{'widget': 'monetary',
'display_currency': o.currency_id}" /></strong>
</td> </td>
</tr>
</xpath> </xpath>
</template> </template>

4
golem_member/report/golem_member_report.xml
View File

@ -112,8 +112,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<td id="activity_inherit_td" class="col-xs-6"> <td id="activity_inherit_td" class="col-xs-6">
<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_total"></tr> <tr id="activity_inherit_sum"></tr>
</tr> </tr>
<tfoot style="text-align:right" id="activity_inherit_total"></tfoot>
</t> </t>
</table> </table>
</div> </div>