From 54697f78bf9c42d5d2fa5456c13601cc2c032be6 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Thu, 22 Feb 2018 18:08:38 +0100
Subject: [PATCH] /

---
 .../report/golem_member_report.xml            | 42 ++++-------
 golem_member/report/golem_member_report.xml   | 70 ++++++++-----------
 2 files changed, 44 insertions(+), 68 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index ec0db6d..377fd70 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -26,10 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <th>Price</th>
           </xpath>
           <xpath expr="//td[@id='activity_inherit_td']" position="after">
-            <td class="col-xs-4">
+            <td class="col-xs-2">
               <span t-field="t.state" />
             </td>
-            <td class="col-xs-4">
+            <td class="col-xs-2">
               <span t-field="t.activity_price" t-field-options="{'widget': 'monetary',
                               'display_currency': o.currency_id}"/>
             </td>
@@ -60,40 +60,30 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           </xpath>
 
           <xpath expr="//table[@id='table_activity_ref']" position="after">
-            <table class="table table-striped">
+            <table class="table">
               <thead>
                 <strong>Invoices</strong>
                 <tr>
-                  <th>Number</th>
-                  <th>Date</th>
                   <th>Activity</th>
-                  <th>Amount</th>
+                  <th>Date</th>
                   <th>State</th>
-                  <th>Residual</th>
+                  <th>Amount</th>
                 </tr>
               </thead>
               <tbody>
                 <t t-foreach="docs" t-as="o">
                   <tr t-foreach="o.activity_registration_ids" t-as="l">
-                    <td class="col-xs-6">
-                      <spam t-field="l.invoice_id.number" />
-                    </td>
-                    <td class="col-xs-6">
-                      <spam t-field="l.invoice_id.date_invoice" />
-                    </td>
-                    <td class="col-xs-6">
+                    <td class="col-xs-3">
                       <spam t-field="l.invoice_line_id.product_id" />
                     </td>
-                    <td class="col-xs-6">
-                      <spam t-field="l.invoice_id.amount_total"
-                            t-field-options="{'widget': 'monetary',
-                                              'display_currency': o.currency_id}"/>
+                    <td class="col-xs-3">
+                      <spam t-field="l.invoice_id.date_invoice" />
                     </td>
-                    <td class="col-xs-6">
+                    <td class="col-xs-3">
                       <spam t-field="l.invoice_id.state" />
                     </td>
-                    <td class="col-xs-6">
-                      <span t-field="l.invoice_id.residual"
+                    <td class="col-xs-3">
+                      <spam t-field="l.invoice_line_id.price_subtotal"
                             t-field-options="{'widget': 'monetary',
                                               'display_currency': o.currency_id}"/>
                     </td>
@@ -106,7 +96,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 <strong>Payments</strong>
                 <tr>
                   <th>Invoice number</th>
-                  <th>Ref payment</th>
                   <th>State</th>
                 </tr>
               </thead>
@@ -114,14 +103,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 <t t-foreach="docs" t-as="o">
                   <tr t-foreach="o.activity_registration_ids" t-as="l">
                     <tr>
-                      <td>
+                      <td class="col-xs-6">
                         <spam t-field="l.invoice_id.number" />
                       </td>
-                      <td>
-                        <spam t-field="l.invoice_id.payment_ids.name" />
-                      </td>
-                      <td>
-                        <spam t-field="l.invoice_id.payment_ids.state" />
+                      <td class="col-xs-6">
+                        <span t-field="l.invoice_id.payment_ids.state" />
                       </td>
 
                     </tr>
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 81e4489..ca7bf60 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -47,41 +47,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <t t-call="report.html_container">
         <t t-call="report.external_layout">
           <div class="page">
-            <table class="table table-striped">
-              <thead>
-                <tr>
-                  <th>Member</th>
-                  <th>Season</th>
-                  <th>Date of season</th>
-                </tr>
-              </thead>
-              <tbody>
-                <t t-foreach="docs" t-as="o">
-                  <tr>
-                    <td class="col-xs-4">
-                        <strong><span t-field="o.name" /></strong><br></br>
-                        <span t-field="o.street" /><br></br>
-                      <t t-if="o.street2">
-                        <span t-field="o.street2" /><br></br>
-                      </t>
-                        <span t-field="o.zip" /><br></br>
-                        <span t-field="o.city" /><br></br>
-                      <t t-if="o.state_id">
-                        <span t-field="o.state_id" /><br></br>
-                      </t>
-                        <span t-field="o.country_id" /><br></br>
-                    </td>
-                    <td class="col-xs-4">
-                        <span t-field="o.season_ids[0].name" /><br></br>
-                    </td>
-                    <td class="col-xs-4">
-                        <span t-field="o.season_ids[0].date_start" /><br></br>
-                        <span t-field="o.season_ids[0].date_end" /><br></br>
-                    </td>
-                  </tr>
+            <t t-foreach="docs" t-as="o">
+              <div class="oe_structure"/>
+                <div class="row">
+                  <div class="col-xs-4">
+                    <strong>Member</strong>
+                      <div t-field="o.partner_id"
+                        t-options='{"widget": "contact", "fields":
+                        ["address", "name", "street", "street2", "phone", "fax"],
+                         "no_marker": True, "phone_icons": True}'/>
+                         <br></br>
+                      </div>
+                <div class="oe_structure"/>
+                  <div class="col-xs-4">
+                    <strong>Season :</strong>
+                      <span t-field="o.season_ids[0].name" />
+                    </div>
+                    <div class="col-xs-4">
+                      <strong>Date :</strong>
+                      <span t-field="o.season_ids[0].date_start" />
+                      -
+                      <span t-field="o.season_ids[0].date_end" />
+                    </div>
+                </div>
                 </t>
-              </tbody>
-            </table>
+
             <table id="table_activity_ref" class="table table-striped">
               <thead>
                 <strong>Activity</strong>
@@ -98,22 +88,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               <tbody>
                 <t t-foreach="docs" t-as="o">
                   <tr id="activity_inherit_price_sum" t-foreach="o.activity_registration_ids" t-as="t">
-                      <td class="col-xs-4">
+                      <td class="col-xs-2">
                         <span t-esc="t.activity_id.name" /><br></br>
                       </td>
-                      <td class="col-xs-4">
+                      <td class="col-xs-2">
                         <span t-field="t.activity_id.animator_id" /><br></br>
                       </td>
-                      <td class="col-xs-4">
+                      <td class="col-xs-2">
                         <span t-field="t.activity_id.weekday" /><br></br>
                       </td>
-                      <td class="col-xs-4">
+                      <td class="col-xs-2">
                         <span t-field="t.activity_id.hour_start" /><br></br>
                       </td>
-                      <td class="col-xs-4">
+                      <td class="col-xs-2">
                           <span t-field="t.activity_id.hour_stop" /><br></br>
                         </td>
-                      <td class="col-xs-4">
+                      <td class="col-xs-2">
                           <span t-field="t.activity_id.date_start" /><br></br>
                       </td>
                       <td id="activity_inherit_td">