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

20
golem_activity_registration_state/report/golem_member_report.xml
View File

@ -33,20 +33,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<span t-field="t.activity_price" />
</td>
</xpath>
<xpath expr="//t[@id='activity_inherit_price_sum']" position="before">
<t t-set="price_sum" t-value="0"/>
</xpath>
<xpath expr="//tr[@id='activity_inherit_price_sum2']" position="after">
<t t-set="activity_price" t-value="t.activity_price" />
</xpath>
<xpath expr="//tr[@id='activity_inherit_total']" position="inside">
<td>
<strong>Total</strong>
<!-- <t t-set="test_variable" t-value="100"/>
<p t-foreach="t.activity_price" t-as="i">
<t t-set="test_variable" t-value="test_variable+i"/>
</p>
<h1>RESULT=<t t-esc="test_variable"/></h1> -->
<p t-foreach="t.activity_price" t-as="i">
<t t-set="i" t-value="0"/>
<t t-set="price_count" t-value="price_base + i"/>
</p>
<h1>RESULT=<t t-esc="price_count" /></h1>
<t t-set="price_sum" t-value="price_sum + t.activity_price"/>
<h1>RESULT=<t t-esc="price_sum" /></h1>
</td>
</xpath>

4
golem_member/report/golem_member_report.xml
View File

@ -89,8 +89,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<th>Date start</th>
<th id="activity_inherit_th">Date stop</th>
</tr>
<t t-foreach="docs" t-as="o">
<tr t-foreach="o.activity_registration_ids" t-as="t">
<t id="activity_inherit_price_sum" t-foreach="docs" t-as="o">
<tr id="activity_inherit_price_sum2" t-foreach="o.activity_registration_ids" t-as="t">
<td class="col-xs-6">
<span t-esc="t.activity_id.name" /><br></br>
</td>