From 9fc3922ba1e495dd429504b935018c8786d01dc8 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Thu, 22 Feb 2018 12:23:13 +0100
Subject: [PATCH] [TMP] Report payment

---
 .../report/golem_member_report.xml            | 32 ++++++++++++-------
 golem_member/report/golem_member_report.xml   | 19 ++++++-----
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index a18e863..ec0db6d 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-6">
+            <td class="col-xs-4">
               <span t-field="t.state" />
             </td>
-            <td class="col-xs-6">
+            <td class="col-xs-4">
               <span t-field="t.activity_price" t-field-options="{'widget': 'monetary',
                               'display_currency': o.currency_id}"/>
             </td>
@@ -37,19 +37,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <xpath expr="//tr[@id='activity_inherit_price_sum']" position="before">
             <t t-set="price_sum" t-value="0"/>
           </xpath>
-          <xpath expr="//tr[@id='activity_inherit_sum']" position="inside">
+          <xpath expr="//tr[@id='activity_inherit_price_sum']" position="inside">
             <t t-set="price_sum" t-value="price_sum + t.activity_price"/>
           </xpath>
           <xpath expr="//tr[@id='activity_inherit_total']" position="replace">
               <tfoot>
                 <tr>
                   <td><td><td><td><td><td><td>
-                      <td class="col-xs-6">
+                      <td>
                         <strong>
                           TOTAL
                         </strong>
                       </td>
-                      <td class="col-xs-6">
+                      <td>
                         <t t-esc="price_sum"
                          t-esc-options="{'widget': 'monetary',
                                          'display_currency': o.currency_id}"/>
@@ -64,8 +64,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               <thead>
                 <strong>Invoices</strong>
                 <tr>
-                  <th>Date</th>
                   <th>Number</th>
+                  <th>Date</th>
                   <th>Activity</th>
                   <th>Amount</th>
                   <th>State</th>
@@ -76,10 +76,10 @@ 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">
                     <td class="col-xs-6">
-                      <spam t-field="l.invoice_id.date_invoice" />
+                      <spam t-field="l.invoice_id.number" />
                     </td>
                     <td class="col-xs-6">
-                      <spam t-field="l.invoice_id[0].number" />
+                      <spam t-field="l.invoice_id.date_invoice" />
                     </td>
                     <td class="col-xs-6">
                       <spam t-field="l.invoice_line_id.product_id" />
@@ -101,12 +101,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 </t>
               </tbody>
             </table>
-
-    <!-- En cours -->
             <table class="table table-striped">
               <thead>
+                <strong>Payments</strong>
                 <tr>
-                  <th>payment</th>
+                  <th>Invoice number</th>
+                  <th>Ref payment</th>
+                  <th>State</th>
                 </tr>
               </thead>
               <tbody>
@@ -114,8 +115,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                   <tr t-foreach="o.activity_registration_ids" t-as="l">
                     <tr>
                       <td>
-                        <spam t-field="o.last_payment_state" />
+                        <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>
+
                     </tr>
                   </tr>
                 </t>
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index d9dbf42..81e4489 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -58,7 +58,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               <tbody>
                 <t t-foreach="docs" t-as="o">
                   <tr>
-                    <td class="col-xs-6">
+                    <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">
@@ -71,10 +71,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                       </t>
                         <span t-field="o.country_id" /><br></br>
                     </td>
-                    <td class="col-xs-6">
+                    <td class="col-xs-4">
                         <span t-field="o.season_ids[0].name" /><br></br>
                     </td>
-                    <td class="col-xs-6">
+                    <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>
@@ -98,28 +98,27 @@ 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-6">
+                      <td class="col-xs-4">
                         <span t-esc="t.activity_id.name" /><br></br>
                       </td>
-                      <td class="col-xs-6">
+                      <td class="col-xs-4">
                         <span t-field="t.activity_id.animator_id" /><br></br>
                       </td>
-                      <td class="col-xs-6">
+                      <td class="col-xs-4">
                         <span t-field="t.activity_id.weekday" /><br></br>
                       </td>
-                      <td class="col-xs-6">
+                      <td class="col-xs-4">
                         <span t-field="t.activity_id.hour_start" /><br></br>
                       </td>
-                      <td class="col-xs-6">
+                      <td class="col-xs-4">
                           <span t-field="t.activity_id.hour_stop" /><br></br>
                         </td>
-                      <td class="col-xs-6">
+                      <td class="col-xs-4">
                           <span t-field="t.activity_id.date_start" /><br></br>
                       </td>
                       <td id="activity_inherit_td">
                           <span t-field="t.activity_id.date_stop" /><br></br>
                       </td>
-                      <tr id="activity_inherit_sum"></tr>
                   </tr>
                   <tr id="activity_inherit_total"></tr>
                 </t>