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] [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>