From 5a93c3c0bd4da266be69faf00e17c6c07d03d5c1 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Mon, 19 Feb 2018 12:08:29 +0100
Subject: [PATCH 01/15] [TMP] report inherit it don't work.

---
 .../report/golem_member_report.xml            | 20 +++++++++----------
 golem_member/report/golem_member_report.xml   |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index 3e58501..acd26a3 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -22,20 +22,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <report id="golem_activity_registration_report"
       string="golem_activity_registration report"
-      model="golem.activity_registration"
+      model="golem.activity_registration_state"
       report_type="qweb-html"
       name="golem_activity.report_golem_member_template" />
 
-      <template id="activity" inherit_id="golem_member.report_golem_member_template">
-            <t t-foreach="docs" t-as="o">
-              <table>
-              <tr t-foreach="o.member_id" t-as="t">
-                <xpath expr="//strong" position="replace">
-                  <span t-field="t.name" />
+      <template id="report_golem_member_template" inherit_id="golem_member.report_golem_member_template">
+                <xpath expr="//td[@id='place']" position="after">
+                  <!-- <span t-set="name" t-value="activity_id.name"/> -->
+                  <td>
+                    <h1> tttttttt<span t-esc="activity_id" /></h1>
+
+                    <!-- <h1> tttttttt<span t-set="state" t-value="activity_registration_ids.state" /></h1> -->
+                  </td>
                 </xpath>
-              </tr>
-              </table>
-            </t>
+
       </template>
 
 </odoo>
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index ca1084c..daef564 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -109,7 +109,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                       <td class="col-xs-6">
                           <span t-field="t.activity_id.date_start" /><br></br>
                       </td>
-                      <td class="col-xs-6">
+                      <td id="place" class="col-xs-6">
                           <span t-field="t.activity_id.date_stop" /><br></br>
                       </td>
                   </tr>
-- 
2.40.1


From f15fcbd222943039773f9693930743cc7a3557d7 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Mon, 19 Feb 2018 16:22:29 +0100
Subject: [PATCH 02/15] /

---
 .../report/golem_member_report.xml            | 36 +++++++++++++------
 golem_member/report/golem_member_report.xml   |  5 +--
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index acd26a3..31cdf30 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -20,19 +20,33 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <odoo>
 
-    <report id="golem_activity_registration_report"
-      string="golem_activity_registration report"
-      model="golem.activity_registration_state"
-      report_type="qweb-html"
-      name="golem_activity.report_golem_member_template" />
-
-      <template id="report_golem_member_template" inherit_id="golem_member.report_golem_member_template">
-                <xpath expr="//td[@id='place']" position="after">
-                  <!-- <span t-set="name" t-value="activity_id.name"/> -->
+      <template id="activity" inherit_id="golem_member.report_golem_member_template">
+                <xpath expr="//th[@id='activity_inherit_th']" position="after">
+                  <th>State</th>
+                  <th>Price</th>
+                </xpath>
+                <xpath expr="//td[@id='activity_inherit_td']" position="after">
                   <td>
-                    <h1> tttttttt<span t-esc="activity_id" /></h1>
+                      <span t-field="t.state" />
+                  </td>
+                  <td>
+                      <span t-field="t.activity_price" />
+                  </td>
+                </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> -->
 
-                    <!-- <h1> tttttttt<span t-set="state" t-value="activity_registration_ids.state" /></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>
                   </td>
                 </xpath>
 
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index daef564..4dbb28e 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -87,7 +87,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                   <th>Hour start</th>
                   <th>Hour stop</th>
                   <th>Date start</th>
-                  <th>Date stop</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">
@@ -109,9 +109,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                       <td class="col-xs-6">
                           <span t-field="t.activity_id.date_start" /><br></br>
                       </td>
-                      <td id="place" class="col-xs-6">
+                      <td id="activity_inherit_td" class="col-xs-6">
                           <span t-field="t.activity_id.date_stop" /><br></br>
                       </td>
+                      <tr id="activity_inherit_total"></tr>
                   </tr>
                 </t>
             </table>
-- 
2.40.1


From 0b6b8e0cfbf640ebd74116c40f2df7d7ca282360 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Mon, 19 Feb 2018 17:00:00 +0100
Subject: [PATCH 03/15] /

---
 .../report/golem_member_report.xml            | 26 +++++++++----------
 golem_member/report/golem_member_report.xml   |  4 +--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index 31cdf30..e9764a3 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -27,28 +27,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 </xpath>
                 <xpath expr="//td[@id='activity_inherit_td']" position="after">
                   <td>
-                      <span t-field="t.state" />
+                    <span t-field="t.state" />
                   </td>
                   <td>
-                      <span t-field="t.activity_price" />
+                    <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>
+              </xpath>
 
       </template>
 
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 4dbb28e..bcd38e7 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -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>
-- 
2.40.1


From e90da41656c91dcfe11b0b3cb509d3768baa0f32 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Mon, 19 Feb 2018 17:03:29 +0100
Subject: [PATCH 04/15] /

---
 .../report/golem_member_report.xml                           | 5 ++---
 golem_member/report/golem_member_report.xml                  | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index e9764a3..8dcd57f 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -37,14 +37,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 <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">
+                <xpath expr="//tr[@id='activity_inherit_price_sum']" 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="price_sum" t-value="price_sum + t.activity_price"/>
-                    <h1>RESULT=<t t-esc="price_sum"  /></h1>
+                    <h1>TOTAL=<t t-esc="price_sum"  /></h1>
                   </td>
               </xpath>
 
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index bcd38e7..09825a3 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -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 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">
+                <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">
                       <span t-esc="t.activity_id.name" /><br></br>
                       </td>
-- 
2.40.1


From 1a71c21e5bd4da6278a429e6aade9ee5cc12031d Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Tue, 20 Feb 2018 10:58:16 +0100
Subject: [PATCH 05/15] [TMP] Report golem_activity_registration_state

---
 .../report/golem_member_report.xml            | 24 ++++++++++++-------
 golem_member/report/golem_member_report.xml   |  4 +++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index 8dcd57f..6fd50d0 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -30,22 +30,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     <span t-field="t.state" />
                   </td>
                   <td>
-                    <span t-field="t.activity_price" />
+                    <span t-field="t.activity_price" t-field-options="{'widget': 'monetary',
+                                    'display_currency': o.currency_id}"/>
                   </td>
                 </xpath>
 
-                <xpath expr="//t[@id='activity_inherit_price_sum']" position="before">
+                <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_price_sum']" position="after">
-                  <t t-set="activity_price" t-value="t.activity_price" />
-                </xpath>
-                <xpath expr="//tr[@id='activity_inherit_total']" position="inside">
-                  <td>
+                <xpath expr="//tr[@id='activity_inherit_sum']" position="inside">
+
                     <t t-set="price_sum" t-value="price_sum + t.activity_price"/>
-                    <h1>TOTAL=<t t-esc="price_sum"  /></h1>
-                  </td>
+
               </xpath>
+              <xpath expr="//tfoot[@id='activity_inherit_total']" position="inside">
+                  <tr>
+                    <td>
+                      <strong>TOTAL=<t t-esc="price_sum"
+                        t-esc-options="{'widget': 'monetary',
+                                        'display_currency': o.currency_id}" /></strong>
+                    </td>
+                  </tr>
+            </xpath>
 
       </template>
 
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 09825a3..8ed4573 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -112,8 +112,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                       <td id="activity_inherit_td" class="col-xs-6">
                           <span t-field="t.activity_id.date_stop" /><br></br>
                       </td>
-                      <tr id="activity_inherit_total"></tr>
+                      <tr id="activity_inherit_sum"></tr>
                   </tr>
+                  <tfoot style="text-align:right" id="activity_inherit_total"></tfoot>
+
                 </t>
             </table>
           </div>
-- 
2.40.1


From 0228a3535baa230bd633bad0ea0c3c1ac17047dc Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Tue, 20 Feb 2018 11:44:48 +0100
Subject: [PATCH 06/15] /

---
 .../report/golem_member_report.xml            | 68 +++++++++++--------
 golem_member/report/golem_member_report.xml   |  4 +-
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index 6fd50d0..011309a 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -21,38 +21,46 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <odoo>
 
       <template id="activity" inherit_id="golem_member.report_golem_member_template">
-                <xpath expr="//th[@id='activity_inherit_th']" position="after">
-                  <th>State</th>
-                  <th>Price</th>
-                </xpath>
-                <xpath expr="//td[@id='activity_inherit_td']" position="after">
+          <xpath expr="//th[@id='activity_inherit_th']" position="after">
+            <th>State</th>
+            <th>Price</th>
+          </xpath>
+          <xpath expr="//td[@id='activity_inherit_td']" position="after">
+            <td>
+              <span t-field="t.state" />
+            </td>
+            <td>
+              <span t-field="t.activity_price" t-field-options="{'widget': 'monetary',
+                              'display_currency': o.currency_id}"/>
+            </td>
+          </xpath>
+          <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">
+            <t t-set="price_sum" t-value="price_sum + t.activity_price"/>
+          </xpath>
+          <xpath expr="//tfoot[@id='activity_inherit_total']" position="inside">
+            <tr>
+              <td>
+                <strong>TOTAL=<t t-esc="price_sum"
+                  t-esc-options="{'widget': 'monetary',
+                                  'display_currency': o.currency_id}" /></strong>
+              </td>
+            </tr>
+          </xpath>
+
+          <xpath expr="//table[@id='table_activity_ref']" position="after">
+            <table class="table table-striped">
+              <t t-foreach="docs" t-as="o">
+                <tr t-foreach="o.activity_registration_ids" t-as="l">
                   <td>
-                    <span t-field="t.state" />
+                    <spam t-field="l.invoice_id.number" />
                   </td>
-                  <td>
-                    <span t-field="t.activity_price" t-field-options="{'widget': 'monetary',
-                                    'display_currency': o.currency_id}"/>
-                  </td>
-                </xpath>
-
-                <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">
-
-                    <t t-set="price_sum" t-value="price_sum + t.activity_price"/>
-
-              </xpath>
-              <xpath expr="//tfoot[@id='activity_inherit_total']" position="inside">
-                  <tr>
-                    <td>
-                      <strong>TOTAL=<t t-esc="price_sum"
-                        t-esc-options="{'widget': 'monetary',
-                                        'display_currency': o.currency_id}" /></strong>
-                    </td>
-                  </tr>
-            </xpath>
-
+                </tr>
+              </t>
+            </table>
+          </xpath>
       </template>
 
 </odoo>
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 8ed4573..a129107 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -79,7 +79,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                   </tr>
                 </t>
             </table>
-            <table class="table table-striped">
+            <table id="table_activity_ref" class="table table-striped">
                 <tr>
                   <th>Activity</th>
                   <th>Animator</th>
@@ -114,7 +114,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                       </td>
                       <tr id="activity_inherit_sum"></tr>
                   </tr>
-                  <tfoot style="text-align:right" id="activity_inherit_total"></tfoot>
+                  <tfoot id="activity_inherit_total"></tfoot>
 
                 </t>
             </table>
-- 
2.40.1


From d2d752992cb16d028020fa25756642a5072065f4 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Tue, 20 Feb 2018 14:52:31 +0100
Subject: [PATCH 07/15] [TMP] Report table of invoices

---
 .../report/golem_member_report.xml            | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index 011309a..577d8d3 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -52,11 +52,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
           <xpath expr="//table[@id='table_activity_ref']" position="after">
             <table class="table table-striped">
+              <thead><h1>Invoices</h1></thead>
+              <tr>
+                <th>Date</th>
+                <th>Number</th>
+                <th>Activity</th>
+                <th>Amount</th>
+                <th>State</th>
+              </tr>
               <t t-foreach="docs" t-as="o">
                 <tr t-foreach="o.activity_registration_ids" t-as="l">
+                  <td>
+                    <spam t-field="l.invoice_id.date_invoice" />
+                  </td>
                   <td>
                     <spam t-field="l.invoice_id.number" />
                   </td>
+                  <td>
+                    <spam t-field="l.invoice_line_id.product_id" />
+                  </td>
+                  <td>
+                    <spam t-field="l.invoice_id.amount_total" />
+                  </td>
+                  <td>
+                    <spam t-field="l.invoice_id.state" />
+                  </td>
                 </tr>
               </t>
             </table>
-- 
2.40.1


From d5af8e87f66b81ccd527ad0512cc6c28062c563e Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Wed, 21 Feb 2018 15:52:10 +0100
Subject: [PATCH 08/15] /

---
 .../report/golem_member_report.xml            | 110 ++++++++++++------
 golem_member/report/golem_member_report.xml   |  29 +++--
 2 files changed, 93 insertions(+), 46 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index 577d8d3..c153b15 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>
+            <td class="col-xs-6">
               <span t-field="t.state" />
             </td>
-            <td>
+            <td class="col-xs-6">
               <span t-field="t.activity_price" t-field-options="{'widget': 'monetary',
                               'display_currency': o.currency_id}"/>
             </td>
@@ -40,45 +40,85 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <xpath expr="//tr[@id='activity_inherit_sum']" position="inside">
             <t t-set="price_sum" t-value="price_sum + t.activity_price"/>
           </xpath>
-          <xpath expr="//tfoot[@id='activity_inherit_total']" position="inside">
-            <tr>
-              <td>
-                <strong>TOTAL=<t t-esc="price_sum"
-                  t-esc-options="{'widget': 'monetary',
-                                  'display_currency': o.currency_id}" /></strong>
-              </td>
+          <xpath expr="//tr[@id='activity_inherit_total']" position="replace">
+              <tfoot>
+                <tr>
+                  <td><td><td><td><td><td><td>
+                      <td class="col-xs-6">
+                        <strong>
+                          TOTAL
+                        </strong>
+                      </td>
+                      <td class="col-xs-6">
+                        <t t-esc="price_sum"
+                         t-esc-options="{'widget': 'monetary',
+                                         'display_currency': o.currency_id}"/>
+                      </td>
+            </td></td></td></td></td></td></td>
             </tr>
+          </tfoot>
           </xpath>
 
           <xpath expr="//table[@id='table_activity_ref']" position="after">
             <table class="table table-striped">
-              <thead><h1>Invoices</h1></thead>
-              <tr>
-                <th>Date</th>
-                <th>Number</th>
-                <th>Activity</th>
-                <th>Amount</th>
-                <th>State</th>
-              </tr>
-              <t t-foreach="docs" t-as="o">
-                <tr t-foreach="o.activity_registration_ids" t-as="l">
-                  <td>
-                    <spam t-field="l.invoice_id.date_invoice" />
-                  </td>
-                  <td>
-                    <spam t-field="l.invoice_id.number" />
-                  </td>
-                  <td>
-                    <spam t-field="l.invoice_line_id.product_id" />
-                  </td>
-                  <td>
-                    <spam t-field="l.invoice_id.amount_total" />
-                  </td>
-                  <td>
-                    <spam t-field="l.invoice_id.state" />
-                  </td>
+              <thead>
+                <strong>Invoices</strong>
+                <tr>
+                  <th>Date</th>
+                  <th>Number</th>
+                  <th>Activity</th>
+                  <th>Amount</th>
+                  <th>State</th>
+                  <th>Residual</th>
                 </tr>
-              </t>
+              </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.date_invoice" />
+                    </td>
+                    <td class="col-xs-6">
+                      <spam t-field="l.invoice_id[0].number" />
+                    </td>
+                    <td class="col-xs-6">
+                      <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>
+                    <td class="col-xs-6">
+                      <spam t-field="l.invoice_id.state" />
+                    </td>
+                    <td class="col-xs-6">
+                      <span t-field="l.invoice_id.residual"
+                            t-field-options="{'widget': 'monetary',
+                                              'display_currency': o.currency_id}"/>
+                    </td>
+                  </tr>
+                </t>
+              </tbody>
+            </table>
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <th>payment</th>
+                </tr>
+              </thead>
+              <tbody>
+                <t t-foreach="docs" t-as="o">
+                  <tr t-foreach="o.payment_ids" t-as="l">
+                    <tr>
+                      <td>
+                        <spam t-field="l.name" />
+                      </td>
+                    </tr>
+                  </tr>
+                </t>
+              </tbody>
+
             </table>
           </xpath>
       </template>
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index a129107..d9dbf42 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -42,32 +42,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       model="golem.member"
       report_type="qweb-html"
       name="golem_member.report_golem_member_template" />
-      <!-- A la Fin remplacer qweb-html par report_type="qweb-pdf" -->
 
     <template id="report_golem_member_template">
       <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-6">
-                      <strong><span t-field="o.name" /></strong><br></br>
-                      <span t-field="o.street" /><br></br>
+                        <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>
+                        <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>
+                        <span t-field="o.country_id" /><br></br>
                     </td>
                     <td class="col-xs-6">
                         <span t-field="o.season_ids[0].name" /><br></br>
@@ -78,10 +80,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     </td>
                   </tr>
                 </t>
+              </tbody>
             </table>
             <table id="table_activity_ref" class="table table-striped">
+              <thead>
+                <strong>Activity</strong>
                 <tr>
-                  <th>Activity</th>
+                  <th>Name</th>
                   <th>Animator</th>
                   <th>Day</th>
                   <th>Hour start</th>
@@ -89,10 +94,12 @@ 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>
+              </thead>
+              <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">
-                      <span t-esc="t.activity_id.name" /><br></br>
+                        <span t-esc="t.activity_id.name" /><br></br>
                       </td>
                       <td class="col-xs-6">
                         <span t-field="t.activity_id.animator_id" /><br></br>
@@ -109,14 +116,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                       <td class="col-xs-6">
                           <span t-field="t.activity_id.date_start" /><br></br>
                       </td>
-                      <td id="activity_inherit_td" class="col-xs-6">
+                      <td id="activity_inherit_td">
                           <span t-field="t.activity_id.date_stop" /><br></br>
                       </td>
                       <tr id="activity_inherit_sum"></tr>
                   </tr>
-                  <tfoot id="activity_inherit_total"></tfoot>
-
+                  <tr id="activity_inherit_total"></tr>
                 </t>
+              </tbody>
             </table>
           </div>
         </t>
-- 
2.40.1


From 98cd54a8f08bf4f2e74e3cb586f0c047d408482e Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Wed, 21 Feb 2018 16:49:09 +0100
Subject: [PATCH 09/15] [TMP] Start report payment

---
 .../report/golem_member_report.xml                          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index c153b15..a18e863 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -101,6 +101,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 </t>
               </tbody>
             </table>
+
+    <!-- En cours -->
             <table class="table table-striped">
               <thead>
                 <tr>
@@ -109,10 +111,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               </thead>
               <tbody>
                 <t t-foreach="docs" t-as="o">
-                  <tr t-foreach="o.payment_ids" t-as="l">
+                  <tr t-foreach="o.activity_registration_ids" t-as="l">
                     <tr>
                       <td>
-                        <spam t-field="l.name" />
+                        <spam t-field="o.last_payment_state" />
                       </td>
                     </tr>
                   </tr>
-- 
2.40.1


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 10/15] [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>
-- 
2.40.1


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 11/15] /

---
 .../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">
-- 
2.40.1


From c176c4aff2e277e76326c7829642622fdaf6371c Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Mon, 26 Feb 2018 11:14:57 +0100
Subject: [PATCH 12/15] /

---
 .../report/golem_member_report.xml                        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index 377fd70..f98182b 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -54,9 +54,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                          t-esc-options="{'widget': 'monetary',
                                          'display_currency': o.currency_id}"/>
                       </td>
-            </td></td></td></td></td></td></td>
-            </tr>
-          </tfoot>
+                  </td></td></td></td></td></td></td>
+                </tr>
+              </tfoot>
           </xpath>
 
           <xpath expr="//table[@id='table_activity_ref']" position="after">
@@ -107,9 +107,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                         <spam t-field="l.invoice_id.number" />
                       </td>
                       <td class="col-xs-6">
+                        <!-- <p t-if="l.invoice_id.payment_ids.state not in ['draft']" > -->
                         <span t-field="l.invoice_id.payment_ids.state" />
                       </td>
-
                     </tr>
                   </tr>
                 </t>
-- 
2.40.1


From e2fe3758693157240f77ec7128bde1c454a50e67 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Mon, 26 Feb 2018 16:52:29 +0100
Subject: [PATCH 13/15] [TMP] Report membership.

---
 .../report/golem_member_report.xml            | 46 ++++++++-------
 golem_member/report/golem_member_report.xml   |  2 +-
 golem_membership/__manifest__.py              |  3 +-
 golem_membership/report/__init__.py           | 19 ++++++
 .../report/golem_member_report.xml            | 58 +++++++++++++++++++
 5 files changed, 104 insertions(+), 24 deletions(-)
 create mode 100644 golem_membership/report/__init__.py
 create mode 100644 golem_membership/report/golem_member_report.xml

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index f98182b..32b4eb5 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -92,29 +92,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               </tbody>
             </table>
             <table class="table table-striped">
-              <thead>
-                <strong>Payments</strong>
-                <tr>
-                  <th>Invoice number</th>
-                  <th>State</th>
-                </tr>
-              </thead>
-              <tbody>
-                <t t-foreach="docs" t-as="o">
-                  <tr t-foreach="o.activity_registration_ids" t-as="l">
-                    <tr>
-                      <td class="col-xs-6">
-                        <spam t-field="l.invoice_id.number" />
-                      </td>
-                      <td class="col-xs-6">
-                        <!-- <p t-if="l.invoice_id.payment_ids.state not in ['draft']" > -->
-                        <span t-field="l.invoice_id.payment_ids.state" />
-                      </td>
-                    </tr>
+                <thead>
+                  <strong>Payments</strong>
+                  <tr>
+                    <th>Invoice number</th>
+                    <th>State</th>
                   </tr>
-                </t>
-              </tbody>
-
+                </thead>
+                <tbody>
+                  <t t-foreach="docs" t-as="o">
+                    <tr t-foreach="o.activity_registration_ids" t-as="l">
+                      <tr>
+                        <td class="col-xs-6">
+                          <spam t-field="l.invoice_id.number" />
+                        </td>
+                        <td class="col-xs-6">
+                          <p t-foreach = "l.invoice_id.payment_ids" t-as = "i" >
+                            <t t-if = "i.state not in ['draft']">
+                            <span  t-esc = "i.state" />
+                          </t>
+                          </p>
+                        </td>
+                      </tr>
+                    </tr>
+                  </t>
+                </tbody>
             </table>
           </xpath>
       </template>
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index ca7bf60..06e4183 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -46,7 +46,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <template id="report_golem_member_template">
       <t t-call="report.html_container">
         <t t-call="report.external_layout">
-          <div class="page">
+          <div id='page_report_member' class="page">
             <t t-foreach="docs" t-as="o">
               <div class="oe_structure"/>
                 <div class="row">
diff --git a/golem_membership/__manifest__.py b/golem_membership/__manifest__.py
index b8e1b0e..890b068 100644
--- a/golem_membership/__manifest__.py
+++ b/golem_membership/__manifest__.py
@@ -26,5 +26,6 @@
     'installable': True,
     'depends': ['golem_member', 'account', 'decimal_precision'],
     'data': ['views/golem_membership_invoice.xml',
-             'views/golem_member_view.xml']
+             'views/golem_member_view.xml',
+             'report/golem_member_report.xml']
 }
diff --git a/golem_membership/report/__init__.py b/golem_membership/report/__init__.py
new file mode 100644
index 0000000..2f46d25
--- /dev/null
+++ b/golem_membership/report/__init__.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Michel Dessenne <michel@yaltik.com>
+
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from . import golem_membership
diff --git a/golem_membership/report/golem_member_report.xml b/golem_membership/report/golem_member_report.xml
new file mode 100644
index 0000000..13dc0c8
--- /dev/null
+++ b/golem_membership/report/golem_member_report.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Michel Dessenne <michel@yaltik.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<odoo>
+
+      <template id="membership" inherit_id="golem_member.report_golem_member_template">
+              <xpath expr="//div[@id='page_report_member']" position="after">
+                <div class="page">
+                  <table class="table">
+                    <thead>
+                      <strong>Membership</strong>
+                      <tr>
+                        <th>Season</th>
+                        <th>Date</th>
+                        <th>State</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <t t-foreach="docs" t-as="o">
+                        <tr>
+                          <td class="col-xs-4">
+                            <spam t-field="o.member_lines.date" />
+                          </td>
+                          <td class="col-xs-4">
+                            <spam t-field="o.member_lines.membership_id" />
+                          </td>
+                          <td class="col-xs-4">
+                            <spam t-field="o.member_lines.state" />
+                          </td>
+                        </tr>
+                      </t>
+                    </tbody>
+                  </table>
+
+
+                </div>
+              </xpath>
+
+      </template>
+
+</odoo>
-- 
2.40.1


From f02a2eb912574aacdfb5c7819e4918c918470c38 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Tue, 27 Feb 2018 10:05:14 +0100
Subject: [PATCH 14/15] [TMP] Report golem_member and golem_membership PDF
 style ok

---
 .../report/golem_member_report.xml            | 56 +++++++++---------
 golem_member/report/golem_member_report.xml   | 11 ++--
 .../report/golem_member_report.xml            | 59 ++++++++++---------
 3 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index 32b4eb5..325a031 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -60,9 +60,10 @@ 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 class="table table-striped">
               <thead>
                 <strong>Invoices</strong>
+                <br></br>
                 <tr>
                   <th>Activity</th>
                   <th>Date</th>
@@ -91,33 +92,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 </t>
               </tbody>
             </table>
-            <table class="table table-striped">
-                <thead>
-                  <strong>Payments</strong>
-                  <tr>
-                    <th>Invoice number</th>
-                    <th>State</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <t t-foreach="docs" t-as="o">
-                    <tr t-foreach="o.activity_registration_ids" t-as="l">
-                      <tr>
-                        <td class="col-xs-6">
-                          <spam t-field="l.invoice_id.number" />
-                        </td>
-                        <td class="col-xs-6">
-                          <p t-foreach = "l.invoice_id.payment_ids" t-as = "i" >
-                            <t t-if = "i.state not in ['draft']">
-                            <span  t-esc = "i.state" />
-                          </t>
-                          </p>
-                        </td>
-                      </tr>
+              <table class="table table-striped" >
+                  <thead>
+                    <strong>Payments</strong>
+                    <br></br>
+                    <tr>
+                      <th>Invoice number</th>
+                      <th>State</th>
                     </tr>
-                  </t>
-                </tbody>
-            </table>
+                  </thead>
+                  <tbody>
+                    <t t-foreach="docs" t-as="o">
+                      <tr t-foreach="o.activity_registration_ids" t-as="l">
+                        <tr>
+                          <td class="col-xs-6">
+                            <spam t-field="l.invoice_id.number" />
+                          </td>
+                          <td class="col-xs-6">
+                            <p t-foreach="l.invoice_id.payment_ids" t-as = "i" >
+                              <t t-if="i.state not in ['draft']">
+                              <span t-esc="i.state" />
+                            </t>
+                            </p>
+                          </td>
+                        </tr>
+                      </tr>
+                    </t>
+                  </tbody>
+              </table>
           </xpath>
       </template>
 
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 06e4183..0bcb247 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -22,17 +22,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <record id="paperformat_euro_landscape"
       model="report.paperformat">
-      <field name="name">European A4 Landscape</field>
+      <field name="name">European A4 Portrait</field>
       <field name="default" eval="True" />
       <field name="format">A4</field>
       <field name="page_height">0</field>
       <field name="page_width">0</field>
-      <field name="orientation">Landscape</field>
+      <field name="orientation">Portrait</field>
       <field name="margin_top">40</field>
       <field name="margin_bottom">23</field>
       <field name="margin_left">7</field>
       <field name="margin_right">7</field>
-      <field name="header_line" eval="False" />
+      <field name="header_line" eval="True" />
       <field name="header_spacing">35</field>
       <field name="dpi">90</field>
     </record>
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <report id="golem_member_report"
       string="Golem member report"
       model="golem.member"
-      report_type="qweb-html"
+      report_type="qweb-pdf"
       name="golem_member.report_golem_member_template" />
 
     <template id="report_golem_member_template">
@@ -68,6 +68,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                       <span t-field="o.season_ids[0].date_start" />
                       -
                       <span t-field="o.season_ids[0].date_end" />
+                      <br></br>
+                      <br></br>
                     </div>
                 </div>
                 </t>
@@ -75,6 +77,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <table id="table_activity_ref" class="table table-striped">
               <thead>
                 <strong>Activity</strong>
+                <br></br>
                 <tr>
                   <th>Name</th>
                   <th>Animator</th>
diff --git a/golem_membership/report/golem_member_report.xml b/golem_membership/report/golem_member_report.xml
index 13dc0c8..6d85d6f 100644
--- a/golem_membership/report/golem_member_report.xml
+++ b/golem_membership/report/golem_member_report.xml
@@ -22,35 +22,40 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
       <template id="membership" inherit_id="golem_member.report_golem_member_template">
               <xpath expr="//div[@id='page_report_member']" position="after">
-                <div class="page">
-                  <table class="table">
-                    <thead>
-                      <strong>Membership</strong>
-                      <tr>
-                        <th>Season</th>
-                        <th>Date</th>
-                        <th>State</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <t t-foreach="docs" t-as="o">
+                <t t-call="report.external_layout">
+                  <div class="page">
+                    <table class="table table-striped">
+                      <thead>
+                        <strong>Membership</strong>
                         <tr>
-                          <td class="col-xs-4">
-                            <spam t-field="o.member_lines.date" />
-                          </td>
-                          <td class="col-xs-4">
-                            <spam t-field="o.member_lines.membership_id" />
-                          </td>
-                          <td class="col-xs-4">
-                            <spam t-field="o.member_lines.state" />
-                          </td>
+                          <th>Season date</th>
+                          <th>Registration</th>
+                          <th>Registration type</th>
+                          <th>State</th>
                         </tr>
-                      </t>
-                    </tbody>
-                  </table>
-
-
-                </div>
+                      </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.date" />
+                            </td>
+                            <td class="col-xs-3">
+                              <spam t-field="o.member_lines.membership_id" />
+                            </td>
+                            <td class="col-xs-3">
+                              <spam t-field="o.membership_state" />
+                            </td>
+                          </tr>
+                        </t>
+                      </tbody>
+                    </table>
+                  </div>
+                </t>
               </xpath>
 
       </template>
-- 
2.40.1


From 0dc0ab06e4d71428c55d9fd365f3bf3f30140b65 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Tue, 27 Feb 2018 11:54:33 +0100
Subject: [PATCH 15/15] [TMP] Clean typo

---
 .../report/golem_member_report.xml            | 62 +++++++++----------
 golem_member/report/golem_member_report.xml   | 29 ++++-----
 2 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
index 325a031..a7f03ce 100644
--- a/golem_activity_registration_state/report/golem_member_report.xml
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -44,15 +44,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               <tfoot>
                 <tr>
                   <td><td><td><td><td><td><td>
-                      <td>
-                        <strong>
-                          TOTAL
-                        </strong>
-                      </td>
-                      <td>
-                        <t t-esc="price_sum"
-                         t-esc-options="{'widget': 'monetary',
-                                         'display_currency': o.currency_id}"/>
+                    <td>
+                      <strong>
+                        TOTAL
+                      </strong>
+                    </td>
+                    <td>
+                      <t t-esc="price_sum"
+                       t-esc-options="{'widget': 'monetary',
+                                       'display_currency': o.currency_id}"/>
                       </td>
                   </td></td></td></td></td></td></td>
                 </tr>
@@ -63,7 +63,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <table class="table table-striped">
               <thead>
                 <strong>Invoices</strong>
-                <br></br>
                 <tr>
                   <th>Activity</th>
                   <th>Date</th>
@@ -93,32 +92,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               </tbody>
             </table>
               <table class="table table-striped" >
-                  <thead>
-                    <strong>Payments</strong>
-                    <br></br>
+                <thead>
+                  <strong>Payments</strong>
                     <tr>
-                      <th>Invoice number</th>
-                      <th>State</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <t t-foreach="docs" t-as="o">
-                      <tr t-foreach="o.activity_registration_ids" t-as="l">
-                        <tr>
-                          <td class="col-xs-6">
-                            <spam t-field="l.invoice_id.number" />
-                          </td>
-                          <td class="col-xs-6">
-                            <p t-foreach="l.invoice_id.payment_ids" t-as = "i" >
-                              <t t-if="i.state not in ['draft']">
+                    <th>Invoice number</th>
+                    <th>State</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">
+                          <p t-foreach="l.invoice_id.payment_ids" t-as = "i" >
+                            <t t-if="i.state not in ['draft']">
                               <span t-esc="i.state" />
                             </t>
-                            </p>
-                          </td>
-                        </tr>
-                      </tr>
-                    </t>
-                  </tbody>
+                          </p>
+                        </td>
+                    </tr>
+                  </t>
+                </tbody>
               </table>
           </xpath>
       </template>
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 0bcb247..bc6d68a 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -56,24 +56,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                         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="oe_structure"/>
                     <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" />
-                      <br></br>
-                      <br></br>
-                    </div>
+                      <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" />
+                        <br></br>
+                        <br></br>
+                      </div>
                 </div>
-                </t>
-
+            </t>
             <table id="table_activity_ref" class="table table-striped">
               <thead>
                 <strong>Activity</strong>
@@ -122,5 +120,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       </t>
     </template>
 
-
 </odoo>
-- 
2.40.1