From af14fb6dd038c99e0408799b41c49d3760efe9b0 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Tue, 13 Feb 2018 12:36:44 +0100
Subject: [PATCH 01/10] [TMP] Create Qweb report of members

---
 golem_member/__manifest__.py                |  5 +--
 golem_member/report/__init__.py             | 16 +++++++++
 golem_member/report/golem_member_report.xml | 38 +++++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 golem_member/report/__init__.py
 create mode 100644 golem_member/report/golem_member_report.xml

diff --git a/golem_member/__manifest__.py b/golem_member/__manifest__.py
index a9c06cd..611e458 100644
--- a/golem_member/__manifest__.py
+++ b/golem_member/__manifest__.py
@@ -18,9 +18,9 @@
 {
     'name': 'GOLEM non-profit members',
     'summary': 'Extends Odoo contacts for MJC',
-    'version': '10.0.1.0.0',
+    'version': '10.0.1.1.0',
     'category': 'GOLEM',
-    'author': 'Fabien Bourgeois',
+    'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',
     'application': True,
     'installable': True,
@@ -30,5 +30,6 @@
              'views/res_partner_views.xml',
              'views/golem_member_numberconfig_views.xml',
              'data/golem_member_numberconfig_data.xml',
+             'report/golem_member_report.xml',
              'security/ir.model.access.csv']
 }
diff --git a/golem_member/report/__init__.py b/golem_member/report/__init__.py
new file mode 100644
index 0000000..643d893
--- /dev/null
+++ b/golem_member/report/__init__.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@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/>.
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
new file mode 100644
index 0000000..e010f87
--- /dev/null
+++ b/golem_member/report/golem_member_report.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright 2017 Fabien Bourgeois <fabien@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>
+    <report id="action_todo_task_report"
+      string="Golem member report"
+      model="golem.member"
+      report_type="qweb-html"
+      name="golem_member.report_golem_member_template" />
+      <!-- A la Fin remplacer qweb-html par report_type="qweb-html" -->
+
+    <template id="report_golem_member_template">
+      <t t-call="report.html_container">
+        <t t-call="report.external_layout">
+          <div class="page">
+          <!-- Report page content -->
+
+          </div>
+        </t>
+      </t>
+    </template>
+</odoo>

From 680604aeccf8fd0d9c687f686b363e0ff19a731b Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Tue, 13 Feb 2018 15:07:17 +0100
Subject: [PATCH 02/10] /

---
 golem_member/__manifest__.py                |  3 +-
 golem_member/report/__init__.py             |  5 ++-
 golem_member/report/golem_member_report.xml | 38 ++++++++++++++++++++-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/golem_member/__manifest__.py b/golem_member/__manifest__.py
index 611e458..4b27ac5 100644
--- a/golem_member/__manifest__.py
+++ b/golem_member/__manifest__.py
@@ -1,7 +1,8 @@
 # -*- 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
diff --git a/golem_member/report/__init__.py b/golem_member/report/__init__.py
index 643d893..6515d8f 100644
--- a/golem_member/report/__init__.py
+++ b/golem_member/report/__init__.py
@@ -1,7 +1,8 @@
 # -*- 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
@@ -14,3 +15,5 @@
 #
 #    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_member
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index e010f87..4b5595e 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -2,6 +2,7 @@
 
 <!--
 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
@@ -18,18 +19,53 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <odoo>
+
+    <record id="paperformat_euro_landscape"
+      model="report.paperformat">
+      <field name="name">European A4 Landscape</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="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_spacing">35</field>
+      <field name="dpi">90</field>
+    </record>
+
     <report id="action_todo_task_report"
       string="Golem member report"
       model="golem.member"
       report_type="qweb-html"
       name="golem_member.report_golem_member_template" />
-      <!-- A la Fin remplacer qweb-html par report_type="qweb-html" -->
+      <!-- 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">
           <!-- Report page content -->
+            <table class="table table-striped">
+                <tr>
+                  <th>Title</th>
+                  <th>Owner</th>
+                  <th>Deadline</th>
+                </tr>
+                <t t-foreach="docs" t-as="o">
+                  <tr>
+                    <td class="col-xs-6">
+                      <span t-field="o.name" />
+                    </td>
+                    <td class="col-xs-3">
+                      <span t-field="o.user_id" />
+                    </td>
+                  </tr>
+                </t>
+            </table>
 
           </div>
         </t>

From cec41edc7fbd9744ede84de0af897fc3c2c99726 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Tue, 13 Feb 2018 18:13:43 +0100
Subject: [PATCH 03/10] [TMP]Qweb report work in proges

---
 golem_member/report/golem_member_report.py  | 33 +++++++++++++++++++
 golem_member/report/golem_member_report.xml | 35 +++++++++++++++++----
 2 files changed, 62 insertions(+), 6 deletions(-)
 create mode 100644 golem_member/report/golem_member_report.py

diff --git a/golem_member/report/golem_member_report.py b/golem_member/report/golem_member_report.py
new file mode 100644
index 0000000..91bf2af
--- /dev/null
+++ b/golem_member/report/golem_member_report.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+#
+#    Copyright 2016 Fabien Bourgeois <fabien@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 odoo import models, fields
+class GolemMember(models.Model):
+    _name = '.golem.member.report'
+    _description = 'Golem member Report'
+    _sql = """
+                CREATE OR REPLACE VIEW todo_task_report AS
+                SELECT *
+                FROM todo_task
+                WHERE active = True
+            """
+    name = fields.Char('Description')
+    is_done = fields.Boolean('Done?')
+    active = fields.Boolean('Active?')
+    user_id = fields.Many2one('res.users', 'Responsible')
+    date_deadline = fields.Date('Deadline')
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 4b5595e..33f3017 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -49,19 +49,42 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <t t-call="report.external_layout">
           <div class="page">
           <!-- Report page content -->
+          <div class="col-xs-3">
+            <div t-field="res_company.partner_id"
+            t-field-options='{
+                              "widget": "contact",
+                              "fields": ["address", "name", "phone", "fax"],
+                              "no_marker": true}' />
+            </div>
             <table class="table table-striped">
                 <tr>
-                  <th>Title</th>
-                  <th>Owner</th>
-                  <th>Deadline</th>
+                  <th>Member</th>
+                  <th>Season</th>
                 </tr>
                 <t t-foreach="docs" t-as="o">
                   <tr>
                     <td class="col-xs-6">
-                      <span t-field="o.name" />
+                      <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">
+                        <span t-field="o.state" /><br></br>
+                      </t>
+                      <span t-field="o.country_id" /><br></br>
                     </td>
-                    <td class="col-xs-3">
-                      <span t-field="o.user_id" />
+                  
+                    <td class="col-xs-6">
+                      <span class="" t-field="o.name" /><br></br>
+                      <span t-field="o.street" /><br></br>
+                      <span t-field="o.street2" /><br></br>
+                      <span t-field="o.zip" /><br></br>
+                      <span t-field="o.city" /><br></br>
+                      <span t-field="o.state_id" /><br></br>
+                      <span t-field="o.country_id" /><br></br>
                     </td>
                   </tr>
                 </t>

From cccd4dfce0672f7fec8df4388cbe3c2e2fa570a7 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Tue, 13 Feb 2018 18:48:16 +0100
Subject: [PATCH 04/10] Season fields

---
 golem_member/report/golem_member_report.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 33f3017..d4a75a3 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -71,20 +71,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                       </t>
                       <span t-field="o.zip" /><br></br>
                       <span t-field="o.city" /><br></br>
-                      <t t-if="o.state">
-                        <span t-field="o.state" /><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-6">
-                      <span class="" t-field="o.name" /><br></br>
-                      <span t-field="o.street" /><br></br>
-                      <span t-field="o.street2" /><br></br>
-                      <span t-field="o.zip" /><br></br>
-                      <span t-field="o.city" /><br></br>
-                      <span t-field="o.state_id" /><br></br>
-                      <span t-field="o.country_id" /><br></br>
+                      <div t-field="res_company.partner_id"
+                            t-field-option='{"fields": ["o.name"]}' />
                     </td>
                   </tr>
                 </t>

From 6043beb5774897dd68d101d27da406b81be2fb27 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Thu, 15 Feb 2018 09:18:29 +0100
Subject: [PATCH 05/10] /

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

diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index d4a75a3..0dd5d14 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -78,8 +78,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     </td>
 
                     <td class="col-xs-6">
-                      <div t-field="res_company.partner_id"
-                            t-field-option='{"fields": ["o.name"]}' />
+                      <!-- <div t-field="golem_season.season_id"
+                            t-field-option='{"fields": ["name"]}' /> -->
+                        <span t-field="o.season_ids" /><br></br>
+
                     </td>
                   </tr>
                 </t>

From d6d265e7c5599069468d0e368a4d1128d0a07f18 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Thu, 15 Feb 2018 18:05:57 +0100
Subject: [PATCH 06/10] /

---
 golem_member/report/golem_member_report.py  | 33 --------------
 golem_member/report/golem_member_report.xml | 49 +++++++++++++++------
 2 files changed, 36 insertions(+), 46 deletions(-)
 delete mode 100644 golem_member/report/golem_member_report.py

diff --git a/golem_member/report/golem_member_report.py b/golem_member/report/golem_member_report.py
deleted file mode 100644
index 91bf2af..0000000
--- a/golem_member/report/golem_member_report.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#    Copyright 2016 Fabien Bourgeois <fabien@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 odoo import models, fields
-class GolemMember(models.Model):
-    _name = '.golem.member.report'
-    _description = 'Golem member Report'
-    _sql = """
-                CREATE OR REPLACE VIEW todo_task_report AS
-                SELECT *
-                FROM todo_task
-                WHERE active = True
-            """
-    name = fields.Char('Description')
-    is_done = fields.Boolean('Done?')
-    active = fields.Boolean('Active?')
-    user_id = fields.Many2one('res.users', 'Responsible')
-    date_deadline = fields.Date('Deadline')
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 0dd5d14..08ce699 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -37,7 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="dpi">90</field>
     </record>
 
-    <report id="action_todo_task_report"
+    <report id="golem_member_report"
       string="Golem member report"
       model="golem.member"
       report_type="qweb-html"
@@ -48,14 +48,6 @@ 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">
-          <!-- Report page content -->
-          <div class="col-xs-3">
-            <div t-field="res_company.partner_id"
-            t-field-options='{
-                              "widget": "contact",
-                              "fields": ["address", "name", "phone", "fax"],
-                              "no_marker": true}' />
-            </div>
             <table class="table table-striped">
                 <tr>
                   <th>Member</th>
@@ -76,19 +68,50 @@ 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">
+                        <span t-field="o.season_ids[0].name" /><br></br>
+                        <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>
+            </table>
+            <table class="table table-striped">
+                <t t-foreach="docs" t-as="o">
+                  <tr>
+                    <td class="col-xs-6">
+                      <span t-field="o.activity_registration_ids.activity_id" /><br></br>
+                    </td>
 
                     <td class="col-xs-6">
-                      <!-- <div t-field="golem_season.season_id"
-                            t-field-option='{"fields": ["name"]}' /> -->
-                        <span t-field="o.season_ids" /><br></br>
+                      <span t-field="o.activity_registration_ids.activity_id.animator_id" /><br></br>
+                    </td>
+                    <td class="col-xs-6">
+                      <span t-field="o.activity_registration_ids.activity_id.weekday" /><br></br>
+                    </td>
+
+                    <td class="col-xs-6">
+                      <span t-field="o.activity_registration_ids.activity_id.hour_start" /><br></br>
+                    </td>
+
+                    <td class="col-xs-6">
+                        <span t-field="o.activity_registration_ids.activity_id.hour_stop" /><br></br>
+                      </td>
+                  
+                    <td class="col-xs-6">
+                      <t t-if="o.activity_registration_ids.activity_id.is_recurrent">
+                        <span t-field="o.activity_registration_ids.activity_id.date_start" /><br></br>
+                        <span t-field="o.activity_registration_ids.activity_id.date_stop" /><br></br>
+                      </t>
 
                     </td>
                   </tr>
                 </t>
             </table>
-
           </div>
         </t>
       </t>
     </template>
+
+
 </odoo>

From 21b16ad08f7c28ba233b61c58f949abeb2886b55 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Thu, 15 Feb 2018 18:30:25 +0100
Subject: [PATCH 07/10] /

---
 golem_member/report/golem_member_report.xml | 26 ++-------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 08ce699..63890b8 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -78,33 +78,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             </table>
             <table class="table table-striped">
                 <t t-foreach="docs" t-as="o">
-                  <tr>
+                  <tr t-foreach="o.activity_registration_id" t-as="t">
                     <td class="col-xs-6">
-                      <span t-field="o.activity_registration_ids.activity_id" /><br></br>
+                      <span t-esc="t['activity_id']" /><br></br>
                     </td>
 
-                    <td class="col-xs-6">
-                      <span t-field="o.activity_registration_ids.activity_id.animator_id" /><br></br>
-                    </td>
-                    <td class="col-xs-6">
-                      <span t-field="o.activity_registration_ids.activity_id.weekday" /><br></br>
-                    </td>
-
-                    <td class="col-xs-6">
-                      <span t-field="o.activity_registration_ids.activity_id.hour_start" /><br></br>
-                    </td>
-
-                    <td class="col-xs-6">
-                        <span t-field="o.activity_registration_ids.activity_id.hour_stop" /><br></br>
-                      </td>
-                  
-                    <td class="col-xs-6">
-                      <t t-if="o.activity_registration_ids.activity_id.is_recurrent">
-                        <span t-field="o.activity_registration_ids.activity_id.date_start" /><br></br>
-                        <span t-field="o.activity_registration_ids.activity_id.date_stop" /><br></br>
-                      </t>
-
-                    </td>
                   </tr>
                 </t>
             </table>

From 6accf16b78f140595a24d3f5d468361c93f74ecf Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Thu, 15 Feb 2018 18:40:49 +0100
Subject: [PATCH 08/10] /

---
 golem_member/report/golem_member_report.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 63890b8..545e862 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -78,7 +78,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             </table>
             <table class="table table-striped">
                 <t t-foreach="docs" t-as="o">
-                  <tr t-foreach="o.activity_registration_id" t-as="t">
+                  <tr t-foreach="o.activity_registration_ids" t-as="t">
                     <td class="col-xs-6">
                       <span t-esc="t['activity_id']" /><br></br>
                     </td>

From 779405e492f1ddbb373b8966fcc075225ae550b9 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Fri, 16 Feb 2018 10:13:56 +0100
Subject: [PATCH 09/10] [TMP] Report of membership.

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

diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 545e862..ca1084c 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -52,6 +52,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 <tr>
                   <th>Member</th>
                   <th>Season</th>
+                  <th>Date of season</th>
                 </tr>
                 <t t-foreach="docs" t-as="o">
                   <tr>
@@ -70,6 +71,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     </td>
                     <td class="col-xs-6">
                         <span t-field="o.season_ids[0].name" /><br></br>
+                    </td>
+                    <td class="col-xs-6">
                         <span t-field="o.season_ids[0].date_start" /><br></br>
                         <span t-field="o.season_ids[0].date_end" /><br></br>
                     </td>
@@ -77,12 +80,38 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 </t>
             </table>
             <table class="table table-striped">
+                <tr>
+                  <th>Activity</th>
+                  <th>Animator</th>
+                  <th>Day</th>
+                  <th>Hour start</th>
+                  <th>Hour stop</th>
+                  <th>Date start</th>
+                  <th>Date stop</th>
+                </tr>
                 <t t-foreach="docs" t-as="o">
                   <tr t-foreach="o.activity_registration_ids" t-as="t">
-                    <td class="col-xs-6">
-                      <span t-esc="t['activity_id']" /><br></br>
-                    </td>
-
+                      <td class="col-xs-6">
+                      <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>
+                      </td>
+                      <td class="col-xs-6">
+                        <span t-field="t.activity_id.weekday" /><br></br>
+                      </td>
+                      <td class="col-xs-6">
+                        <span t-field="t.activity_id.hour_start" /><br></br>
+                      </td>
+                      <td class="col-xs-6">
+                          <span t-field="t.activity_id.hour_stop" /><br></br>
+                        </td>
+                      <td class="col-xs-6">
+                          <span t-field="t.activity_id.date_start" /><br></br>
+                      </td>
+                      <td class="col-xs-6">
+                          <span t-field="t.activity_id.date_stop" /><br></br>
+                      </td>
                   </tr>
                 </t>
             </table>

From 01bf414187fa3f1a376864424602522bcb3f40b2 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Fri, 16 Feb 2018 17:47:52 +0100
Subject: [PATCH 10/10] [TMP] Report golem_activity_registration_state inherit
 golem_member

---
 .../__manifest__.py                           |  3 +-
 .../report/__init__.py                        | 19 +++++++++
 .../report/golem_member_report.xml            | 41 +++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 golem_activity_registration_state/report/__init__.py
 create mode 100644 golem_activity_registration_state/report/golem_member_report.xml

diff --git a/golem_activity_registration_state/__manifest__.py b/golem_activity_registration_state/__manifest__.py
index e8f02db..3b1d05f 100644
--- a/golem_activity_registration_state/__manifest__.py
+++ b/golem_activity_registration_state/__manifest__.py
@@ -27,5 +27,6 @@
     'depends': ['golem_activity_registration', 'golem_payment'],
     'data': ['views/golem_activity_registration_views.xml',
              'views/golem_member_views.xml', 'views/golem_activity_views.xml',
-             'wizard/golem_activity_registration_invoicing.xml']
+             'wizard/golem_activity_registration_invoicing.xml',
+             'report/golem_member_report.xml']
 }
diff --git a/golem_activity_registration_state/report/__init__.py b/golem_activity_registration_state/report/__init__.py
new file mode 100644
index 0000000..cf00e58
--- /dev/null
+++ b/golem_activity_registration_state/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_activity_registration
diff --git a/golem_activity_registration_state/report/golem_member_report.xml b/golem_activity_registration_state/report/golem_member_report.xml
new file mode 100644
index 0000000..3e58501
--- /dev/null
+++ b/golem_activity_registration_state/report/golem_member_report.xml
@@ -0,0 +1,41 @@
+<?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>
+
+    <report id="golem_activity_registration_report"
+      string="golem_activity_registration report"
+      model="golem.activity_registration"
+      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" />
+                </xpath>
+              </tr>
+              </table>
+            </t>
+      </template>
+
+</odoo>