[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
2 changed files with 42 additions and 49 deletions
Showing only changes of commit 0dc0ab06e4 - Show all commits

View File

@ -63,7 +63,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<strong>Invoices</strong> <strong>Invoices</strong>
<br></br>
<tr> <tr>
<th>Activity</th> <th>Activity</th>
<th>Date</th> <th>Date</th>
@ -95,7 +94,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<table class="table table-striped" > <table class="table table-striped" >
<thead> <thead>
<strong>Payments</strong> <strong>Payments</strong>
<br></br>
<tr> <tr>
<th>Invoice number</th> <th>Invoice number</th>
<th>State</th> <th>State</th>
@ -104,7 +102,6 @@ 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 t-foreach="o.activity_registration_ids" t-as="l"> <tr t-foreach="o.activity_registration_ids" t-as="l">
<tr>
<td class="col-xs-6"> <td class="col-xs-6">
<spam t-field="l.invoice_id.number" /> <spam t-field="l.invoice_id.number" />
</td> </td>
@ -116,7 +113,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</p> </p>
</td> </td>
</tr> </tr>
</tr>
</t> </t>
</tbody> </tbody>
</table> </table>

View File

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