From 9898a98da16fe1988205e0e31531cb4c0d21f7c8 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Thu, 8 Mar 2018 14:56:34 +0100
Subject: [PATCH] [REF][FIX]GOLEM Member card membership section

---
 golem_membership/__manifest__.py              |  2 +-
 .../report/golem_member_report.xml            | 83 ++++++++++---------
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/golem_membership/__manifest__.py b/golem_membership/__manifest__.py
index 890b068..b6833f1 100644
--- a/golem_membership/__manifest__.py
+++ b/golem_membership/__manifest__.py
@@ -18,7 +18,7 @@
 {
     'name': 'GOLEM non-profit membership handling',
     'summary': 'Extends Odoo membership',
-    'version': '10.0.1.1.0',
+    'version': '10.0.1.1.1',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',
diff --git a/golem_membership/report/golem_member_report.xml b/golem_membership/report/golem_member_report.xml
index fe09de2..b3632cc 100644
--- a/golem_membership/report/golem_member_report.xml
+++ b/golem_membership/report/golem_member_report.xml
@@ -20,44 +20,49 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <odoo>
 
-      <template id="membership" inherit_id="golem_member.golem_member_card_template">
-              <xpath expr="//div[@id='page_report_member']" position="after">
-                <t t-call="report.external_layout">
-                  <div class="page">
-                    <table class="table table-striped">
-                      <thead>
-                        <strong>Membership</strong>
-                        <tr>
-                          <th>Season date</th>
-                          <th>Registration</th>
-                          <th>Registration type</th>
-                          <th>State</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        <t t-foreach="docs" t-as="o">
-                          <tr>
-                            <td class="col-xs-3">
-                              <spam t-field="o.membership_start" />
-                              <spam t-field="o.membership_stop" />
-                            </td>
-                            <td class="col-xs-3">
-                              <spam t-field="o.member_lines[0].date" />
-                            </td>
-                            <td class="col-xs-3">
-                              <spam t-field="o.member_lines[0].membership_id" />
-                            </td>
-                            <td class="col-xs-3">
-                              <spam t-field="o.membership_state" />
-                            </td>
-                          </tr>
-                        </t>
-                      </tbody>
-                    </table>
-                  </div>
-                </t>
-              </xpath>
-
-      </template>
+  <template id="golem_member_card_template_inherit_golem_membership"
+    inherit_id="golem_member.golem_member_card_template">
+    <xpath expr="//div[@id='page_report_member']" position="after">
+      <div class="page">
+        <div class="row">
+          <h2>Membership</h2>
+        </div>
+        <table class="table table-striped">
+          <thead>
+            <tr>
+              <th>Registration</th>
+              <th>Registration date</th>
+              <th>Date from</th>
+              <th>Date to</th>
+              <th>State</th>
+            </tr>
+          </thead>
+          <tbody>
+            <t t-foreach="docs" t-as="member">
+              <t t-foreach="member.member_lines" t-as="mline">
+                <tr>
+                  <td class="col-xs-3">
+                    <spam t-field="mline.membership_id" />
+                  </td>
+                  <td class="col-xs-2">
+                    <spam t-field="mline.date_from" />
+                  </td>
+                  <td class="col-xs-2">
+                    <spam t-field="mline.date_to" />
+                  </td>
+                  <td class="col-xs-2">
+                    <spam t-field="mline.date" />
+                  </td>
+                  <td class="col-xs-3">
+                    <spam t-field="mline.state" />
+                  </td>
+                </tr>
+              </t>
+            </t>
+          </tbody>
+        </table>
+      </div>
+    </xpath>
+  </template>
 
 </odoo>