From a907c23e066c111afc2dc6d807ff75804dcbe15e Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 28 Sep 2018 02:00:22 +0100
Subject: [PATCH 01/52] Add default gardian field and function

---
 golem_member_minor/models/res_partner.py | 36 ++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 golem_member_minor/models/res_partner.py

diff --git a/golem_member_minor/models/res_partner.py b/golem_member_minor/models/res_partner.py
new file mode 100644
index 0000000..5b93626
--- /dev/null
+++ b/golem_member_minor/models/res_partner.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2017-2018 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/>.
+
+""" GOLEM Member Minor management """
+
+from datetime import date, timedelta
+from odoo import models, fields, api
+
+ADULT_DURATION = timedelta(days=365.25*18)
+
+class GolemMember(models.Model):
+    """ GOLEM Member adaptations """
+    _inherit = 'res.partner'
+
+    is_default_gardian = fields.Boolean()
+
+
+    def do_default_gardian(self):
+        """ make only default gardian """
+        self.ensure_one()
+        self.is_default_gardian = True
+        member_id = self._context.get('member_id', False)

From 3bcba79dbbf2667f848c52552ec8c2427e6e2192 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 28 Sep 2018 02:00:53 +0100
Subject: [PATCH 02/52] Add default gardian field and button to view

---
 golem_member_minor/views/golem_member_views.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/golem_member_minor/views/golem_member_views.xml b/golem_member_minor/views/golem_member_views.xml
index 412df59..48c9888 100644
--- a/golem_member_minor/views/golem_member_views.xml
+++ b/golem_member_minor/views/golem_member_views.xml
@@ -38,6 +38,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 context="{'search_default_type_person': 1}">
                 <tree>
                   <field name="name" />
+                  <field name="is_default_gardian"/>
+                  <button name="do_default_gardian" type="object"
+                    icon="fa-bookmark"
+                    attrs="{'invisible': [('is_default_gardian', '=', False)]}"
+                    context="{'member_id': id}"/>
                   <field name="contact_address" />
                   <field name="phone" />
                   <field name="mobile" />

From 6105d2d8c0e69314a784afbb9ac1885ac033e9c3 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 28 Sep 2018 02:01:11 +0100
Subject: [PATCH 03/52] edit models/__init__

---
 golem_member_minor/models/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/golem_member_minor/models/__init__.py b/golem_member_minor/models/__init__.py
index f4e5ac9..01d6047 100644
--- a/golem_member_minor/models/__init__.py
+++ b/golem_member_minor/models/__init__.py
@@ -15,4 +15,4 @@
 #    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
+from . import golem_member, res_partner

From 4c9bfe446ad6e20d4b6cebea0c7f2d46618ec5ab Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 28 Sep 2018 02:04:00 +0100
Subject: [PATCH 04/52] Small code refactoring

---
 golem_member_minor/models/res_partner.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/golem_member_minor/models/res_partner.py b/golem_member_minor/models/res_partner.py
index 5b93626..5a17c8d 100644
--- a/golem_member_minor/models/res_partner.py
+++ b/golem_member_minor/models/res_partner.py
@@ -15,20 +15,16 @@
 #    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/>.
 
-""" GOLEM Member Minor management """
+""" Res Partner adaptations """
 
-from datetime import date, timedelta
-from odoo import models, fields, api
+from odoo import models, fields
 
-ADULT_DURATION = timedelta(days=365.25*18)
-
-class GolemMember(models.Model):
-    """ GOLEM Member adaptations """
+class ResPartner(models.Model):
+    """ Res Partner adaptations """
     _inherit = 'res.partner'
 
     is_default_gardian = fields.Boolean()
 
-
     def do_default_gardian(self):
         """ make only default gardian """
         self.ensure_one()

From 459972669c72c62308ffe2bfe81afcfaf834c6e8 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 28 Sep 2018 02:21:16 +0100
Subject: [PATCH 05/52] Add single_parent field and filter to views

---
 golem_family/views/golem_family_views.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/golem_family/views/golem_family_views.xml b/golem_family/views/golem_family_views.xml
index 46d495c..2900161 100644
--- a/golem_family/views/golem_family_views.xml
+++ b/golem_family/views/golem_family_views.xml
@@ -34,6 +34,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                   <label for="name" string="Family" class="oe_edit_only" />
                   <field name="name" class="oe_inline" placeholder="Name" />
                 </h1>
+                <label for="single_parent" string="Single-Parent Family"/>
+                <field name="single_parent"/>
               </div>
             </group>
             <group string="Address">
@@ -187,6 +189,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <field name="phone" />
           <field name="mobile" />
           <field name="email" />
+          <filter name="single_parent" string="Single-parent Family"
+            domain="[('single_parent', '=', True)]"/>
           <group string="Group By">
             <filter name="group_city" string="By city"
               context="{'group_by': 'city'}"/>

From 66b50577096a16b932ee394f789629a35ecf63dd Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 28 Sep 2018 02:21:38 +0100
Subject: [PATCH 06/52] Add single_parent field to model

---
 golem_family/models/golem_family.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/golem_family/models/golem_family.py b/golem_family/models/golem_family.py
index d6c7364..505dc9c 100644
--- a/golem_family/models/golem_family.py
+++ b/golem_family/models/golem_family.py
@@ -143,6 +143,8 @@ class GolemFamily(models.Model):
     note = fields.Text()
     count = fields.Integer(compute='_compute_count', store=True)
 
+    single_parent = fields.Boolean()
+
     @api.depends('member_ids')
     def _compute_count(self):
         for family in self:

From 8a5d18c2f0a5d375731f799c2e3a30041e510949 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 1 Oct 2018 01:23:31 +0100
Subject: [PATCH 07/52] Add the new legal gardian tree to form

---
 .../views/golem_member_views.xml              | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/golem_member_minor/views/golem_member_views.xml b/golem_member_minor/views/golem_member_views.xml
index 48c9888..9bf4c9e 100644
--- a/golem_member_minor/views/golem_member_views.xml
+++ b/golem_member_minor/views/golem_member_views.xml
@@ -34,19 +34,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               <field name="leave_alone"/>
               <field name="partner_id" invisible="True" required="False" />
               <field name="is_minor" invisible="True" />
-              <field name="legal_guardian_ids"
-                context="{'search_default_type_person': 1}">
+              <field name="legal_guardian2_ids" context="{'default_member_id': active_id}">
                 <tree>
-                  <field name="name" />
-                  <field name="is_default_gardian"/>
-                  <button name="do_default_gardian" type="object"
-                    icon="fa-bookmark"
-                    attrs="{'invisible': [('is_default_gardian', '=', False)]}"
-                    context="{'member_id': id}"/>
+                  <field name="name"/>
                   <field name="contact_address" />
                   <field name="phone" />
                   <field name="mobile" />
                   <field name="email" widget="email" />
+                  <field name="is_default_gardian"/>
+                  <button name="do_default_gardian" type="object"
+                    icon="fa-bookmark"
+                    attrs="{'invisible': [('is_default_gardian', '=', True)]}"/>
                 </tree>
               </field>
             </group>
@@ -54,6 +52,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         </page>
       </field>
     </record>
+    <!-- Forms -->
+    <record id="golem_legal_gardian_form" model="ir.ui.view">
+      <field name="name">GOLEM Legal Gardian Form</field>
+      <field name="model">golem.legal.gardian</field>
+      <field name="arch" type="xml">
+        <form>
+          <group>
+            <field name="member_id" invisible="1"/>
+            <field name="legal_gardian_id"/>
+            <field name="is_default_gardian"/>
+          </group>
+        </form>
+      </field>
+    </record>
 
     <!-- Search -->
     <record model="ir.ui.view" id="golem_member_search_inherit_minor">

From f864d4a5ca57ea9eae695d6c05cb810e52170190 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 1 Oct 2018 01:24:13 +0100
Subject: [PATCH 08/52] Add the the new legal_guardian2_ids field to
 golem_member

---
 golem_member_minor/models/golem_member.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/golem_member_minor/models/golem_member.py b/golem_member_minor/models/golem_member.py
index ab31550..24cd3fe 100644
--- a/golem_member_minor/models/golem_member.py
+++ b/golem_member_minor/models/golem_member.py
@@ -29,6 +29,8 @@ class GolemMember(models.Model):
     legal_guardian_ids = fields.Many2many(
         'res.partner', string='Legal guardians', index=True, auto_join=True,
         domain="['&', ('is_company', '=', False), ('id', '!=', partner_id)]")
+    legal_guardian2_ids = fields.One2many('golem.legal.gardian', 'member_id',
+                                          string='Legal guardians')
     activities_participation = fields.Boolean('Activities participation?')
     leave_alone = fields.Boolean('Can leave alone?')
     is_minor = fields.Boolean('Is minor?', compute='_compute_is_minor',

From a58caf5b83b26a832d55d5274cfe1f0086e52fbb Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 1 Oct 2018 01:25:19 +0100
Subject: [PATCH 09/52] Create legal_gardian module, and add do_default and
 create function

---
 .../models/golem_legal_gardian.py             | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 golem_member_minor/models/golem_legal_gardian.py

diff --git a/golem_member_minor/models/golem_legal_gardian.py b/golem_member_minor/models/golem_legal_gardian.py
new file mode 100644
index 0000000..8dbd5e5
--- /dev/null
+++ b/golem_member_minor/models/golem_legal_gardian.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2017-2018 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/>.
+
+""" Golem Legal Gardian Management """
+
+from odoo import models, fields, api
+
+class GolemLegalGardian(models.Model):
+    """ Golem Legal Gardian Management """
+    _name = 'golem.legal.gardian'
+
+    member_id = fields.Many2one('golem.member', required=True,
+                                ondelete='cascade',
+                                readonly=True)
+    legal_gardian_id = fields.Many2one('res.partner', required=True,
+                                       domain="[('is_company', '=', False)]",
+                                       ondelete='cascade')
+    name = fields.Char(related="legal_gardian_id.name")
+    contact_address = fields.Char(related="legal_gardian_id.contact_address")
+    phone = fields.Char(related="legal_gardian_id.phone")
+    mobile = fields.Char(related="legal_gardian_id.mobile")
+    email = fields.Char(related="legal_gardian_id.email")
+
+
+    is_default_gardian = fields.Boolean()
+
+
+    def do_default_gardian(self):
+        """ Make current only default gardian """
+        self.ensure_one()
+        self.write({'is_default_gardian': True})
+        legal_list = self.member_id.legal_guardian2_ids.filtered(
+            lambda a: a.legal_gardian_id not in self.legal_gardian_id)
+        legal_list.write({'is_default_gardian': False})
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'reload'
+            }
+
+    @api.model
+    def create(self, values):
+        """ If current gardian is default if the only, and the only if default """
+        if values['is_default_gardian']:
+            self.env['golem.member'].browse(values['member_id']).legal_guardian2_ids.write(
+                {'is_default_gardian': False})
+        if not self.env['golem.member'].browse(values['member_id']).legal_guardian2_ids:
+            values['is_default_gardian'] = True
+        return  super(GolemLegalGardian, self).create(values)

From f69c1f4951510eab1fde926cb6c57ef3a8b66cc8 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 1 Oct 2018 01:25:28 +0100
Subject: [PATCH 10/52] edit init

---
 golem_member_minor/models/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/golem_member_minor/models/__init__.py b/golem_member_minor/models/__init__.py
index 01d6047..57273fd 100644
--- a/golem_member_minor/models/__init__.py
+++ b/golem_member_minor/models/__init__.py
@@ -15,4 +15,4 @@
 #    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, res_partner
+from . import golem_member, golem_legal_gardian

From f63264fe626422a7d8f4d66d7ffdcb3b6674e44d Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 1 Oct 2018 14:31:28 +0100
Subject: [PATCH 11/52] Forbide the default legal gardian removal is he's not
 the only

---
 golem_member_minor/models/golem_legal_gardian.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/golem_member_minor/models/golem_legal_gardian.py b/golem_member_minor/models/golem_legal_gardian.py
index 8dbd5e5..b49821a 100644
--- a/golem_member_minor/models/golem_legal_gardian.py
+++ b/golem_member_minor/models/golem_legal_gardian.py
@@ -17,7 +17,8 @@
 
 """ Golem Legal Gardian Management """
 
-from odoo import models, fields, api
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
 
 class GolemLegalGardian(models.Model):
     """ Golem Legal Gardian Management """
@@ -53,10 +54,20 @@ class GolemLegalGardian(models.Model):
 
     @api.model
     def create(self, values):
-        """ If current gardian is default if the only, and the only if default """
+        """ Make the current gardian is default if the only, and the only if default """
         if values['is_default_gardian']:
             self.env['golem.member'].browse(values['member_id']).legal_guardian2_ids.write(
                 {'is_default_gardian': False})
         if not self.env['golem.member'].browse(values['member_id']).legal_guardian2_ids:
             values['is_default_gardian'] = True
         return  super(GolemLegalGardian, self).create(values)
+
+    @api.multi
+    def unlink(self):
+        """ Forbids default legal gardian removal """
+        for gardian in self:
+            if gardian.is_default_gardian and len(gardian.member_id.legal_guardian2_ids) > 1:
+                emsg = _('You can\'t delete the default legal gardian')
+                raise ValidationError(emsg)
+            else:
+                return super(GolemLegalGardian, self).unlink()

From 61eaea0ea6093af7a33a57bb521c7fb262aef1d3 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 1 Oct 2018 23:55:02 +0100
Subject: [PATCH 12/52] Small code refactorings

---
 golem_member_minor/models/__init__.py         |  2 +-
 .../models/golem_legal_gardian.py             | 73 -------------------
 .../models/golem_legal_guardian.py            | 72 ++++++++++++++++++
 golem_member_minor/models/golem_member.py     |  7 +-
 4 files changed, 75 insertions(+), 79 deletions(-)
 delete mode 100644 golem_member_minor/models/golem_legal_gardian.py
 create mode 100644 golem_member_minor/models/golem_legal_guardian.py

diff --git a/golem_member_minor/models/__init__.py b/golem_member_minor/models/__init__.py
index 57273fd..6bf7b26 100644
--- a/golem_member_minor/models/__init__.py
+++ b/golem_member_minor/models/__init__.py
@@ -15,4 +15,4 @@
 #    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, golem_legal_gardian
+from . import golem_member, golem_legal_guardian
diff --git a/golem_member_minor/models/golem_legal_gardian.py b/golem_member_minor/models/golem_legal_gardian.py
deleted file mode 100644
index b49821a..0000000
--- a/golem_member_minor/models/golem_legal_gardian.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2017-2018 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/>.
-
-""" Golem Legal Gardian Management """
-
-from odoo import models, fields, api, _
-from odoo.exceptions import ValidationError
-
-class GolemLegalGardian(models.Model):
-    """ Golem Legal Gardian Management """
-    _name = 'golem.legal.gardian'
-
-    member_id = fields.Many2one('golem.member', required=True,
-                                ondelete='cascade',
-                                readonly=True)
-    legal_gardian_id = fields.Many2one('res.partner', required=True,
-                                       domain="[('is_company', '=', False)]",
-                                       ondelete='cascade')
-    name = fields.Char(related="legal_gardian_id.name")
-    contact_address = fields.Char(related="legal_gardian_id.contact_address")
-    phone = fields.Char(related="legal_gardian_id.phone")
-    mobile = fields.Char(related="legal_gardian_id.mobile")
-    email = fields.Char(related="legal_gardian_id.email")
-
-
-    is_default_gardian = fields.Boolean()
-
-
-    def do_default_gardian(self):
-        """ Make current only default gardian """
-        self.ensure_one()
-        self.write({'is_default_gardian': True})
-        legal_list = self.member_id.legal_guardian2_ids.filtered(
-            lambda a: a.legal_gardian_id not in self.legal_gardian_id)
-        legal_list.write({'is_default_gardian': False})
-        return {
-            'type': 'ir.actions.client',
-            'tag': 'reload'
-            }
-
-    @api.model
-    def create(self, values):
-        """ Make the current gardian is default if the only, and the only if default """
-        if values['is_default_gardian']:
-            self.env['golem.member'].browse(values['member_id']).legal_guardian2_ids.write(
-                {'is_default_gardian': False})
-        if not self.env['golem.member'].browse(values['member_id']).legal_guardian2_ids:
-            values['is_default_gardian'] = True
-        return  super(GolemLegalGardian, self).create(values)
-
-    @api.multi
-    def unlink(self):
-        """ Forbids default legal gardian removal """
-        for gardian in self:
-            if gardian.is_default_gardian and len(gardian.member_id.legal_guardian2_ids) > 1:
-                emsg = _('You can\'t delete the default legal gardian')
-                raise ValidationError(emsg)
-            else:
-                return super(GolemLegalGardian, self).unlink()
diff --git a/golem_member_minor/models/golem_legal_guardian.py b/golem_member_minor/models/golem_legal_guardian.py
new file mode 100644
index 0000000..b19065b
--- /dev/null
+++ b/golem_member_minor/models/golem_legal_guardian.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2017-2018 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/>.
+
+""" Golem Legal Guardian Management """
+
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+
+class GolemLegalGuardian(models.Model):
+    """ Golem Legal Guardian Management """
+    _name = 'golem.legal.guardian'
+
+    member_id = fields.Many2one('golem.member', required=True,
+                                ondelete='cascade',
+                                readonly=True)
+    legal_guardian_id = fields.Many2one('res.partner', required=True,
+                                        domain="[('is_company', '=', False)]",
+                                        ondelete='cascade')
+    name = fields.Char(related="legal_guardian_id.name")
+    contact_address = fields.Char(related="legal_guardian_id.contact_address")
+    phone = fields.Char(related="legal_guardian_id.phone")
+    mobile = fields.Char(related="legal_guardian_id.mobile")
+    email = fields.Char(related="legal_guardian_id.email")
+
+
+    is_default_guardian = fields.Boolean()
+
+    def do_default_guardian(self):
+        """ Make current only default guardian """
+        self.ensure_one()
+        self.write({'is_default_guardian': True})
+        legal_list = self.member_id.legal_guardian_ids.filtered(
+            lambda a: a.legal_guardian_id not in self.legal_guardian_id)
+        legal_list.write({'is_default_guardian': False})
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'reload'
+            }
+
+    @api.model
+    def create(self, values):
+        """ Make the current guardian is default if the only, and the only if default """
+        if values['is_default_guardian']:
+            self.env['golem.member'].browse(values['member_id']).legal_guardian_ids.write(
+                {'is_default_guardian': False})
+        if not self.env['golem.member'].browse(values['member_id']).legal_guardian_ids:
+            values['is_default_guardian'] = True
+        return  super(GolemLegalGuardian, self).create(values)
+
+    @api.multi
+    def unlink(self):
+        """ Forbids default legal guardian removal """
+        for guardian in self:
+            if guardian.is_default_guardian and len(guardian.member_id.legal_guardian_ids) > 1:
+                emsg = _('You can\'t delete the default legal guardian')
+                raise ValidationError(emsg)
+            else:
+                return super(GolemLegalGuardian, self).unlink()
diff --git a/golem_member_minor/models/golem_member.py b/golem_member_minor/models/golem_member.py
index 24cd3fe..b0ef6fd 100644
--- a/golem_member_minor/models/golem_member.py
+++ b/golem_member_minor/models/golem_member.py
@@ -26,11 +26,8 @@ class GolemMember(models.Model):
     """ GOLEM Member adaptations """
     _inherit = 'golem.member'
 
-    legal_guardian_ids = fields.Many2many(
-        'res.partner', string='Legal guardians', index=True, auto_join=True,
-        domain="['&', ('is_company', '=', False), ('id', '!=', partner_id)]")
-    legal_guardian2_ids = fields.One2many('golem.legal.gardian', 'member_id',
-                                          string='Legal guardians')
+    legal_guardian_ids = fields.One2many('golem.legal.guardian', 'member_id',
+                                         string='Legal guardians')
     activities_participation = fields.Boolean('Activities participation?')
     leave_alone = fields.Boolean('Can leave alone?')
     is_minor = fields.Boolean('Is minor?', compute='_compute_is_minor',

From b87a4d57ae0337654df8e9e7832b3bcf47a50a35 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 1 Oct 2018 23:56:26 +0100
Subject: [PATCH 13/52] Small code refactorings

---
 .../views/golem_member_views.xml               | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/golem_member_minor/views/golem_member_views.xml b/golem_member_minor/views/golem_member_views.xml
index 9bf4c9e..bea5849 100644
--- a/golem_member_minor/views/golem_member_views.xml
+++ b/golem_member_minor/views/golem_member_views.xml
@@ -34,17 +34,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               <field name="leave_alone"/>
               <field name="partner_id" invisible="True" required="False" />
               <field name="is_minor" invisible="True" />
-              <field name="legal_guardian2_ids" context="{'default_member_id': active_id}">
+              <field name="legal_guardian_ids" context="{'default_member_id': active_id}">
                 <tree>
                   <field name="name"/>
                   <field name="contact_address" />
                   <field name="phone" />
                   <field name="mobile" />
                   <field name="email" widget="email" />
-                  <field name="is_default_gardian"/>
-                  <button name="do_default_gardian" type="object"
+                  <field name="is_default_guardian"/>
+                  <button name="do_default_guardian" type="object"
                     icon="fa-bookmark"
-                    attrs="{'invisible': [('is_default_gardian', '=', True)]}"/>
+                    attrs="{'invisible': [('is_default_guardian', '=', True)]}"/>
                 </tree>
               </field>
             </group>
@@ -53,15 +53,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       </field>
     </record>
     <!-- Forms -->
-    <record id="golem_legal_gardian_form" model="ir.ui.view">
-      <field name="name">GOLEM Legal Gardian Form</field>
-      <field name="model">golem.legal.gardian</field>
+    <record id="golem_legal_guardian_form" model="ir.ui.view">
+      <field name="name">GOLEM Legal Guardian Form</field>
+      <field name="model">golem.legal.guardian</field>
       <field name="arch" type="xml">
         <form>
           <group>
             <field name="member_id" invisible="1"/>
-            <field name="legal_gardian_id"/>
-            <field name="is_default_gardian"/>
+            <field name="legal_guardian_id"/>
+            <field name="is_default_guardian"/>
           </group>
         </form>
       </field>

From a2ac0fbb79679612c69adc9e0c96ee5db23cae88 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 1 Oct 2018 23:56:53 +0100
Subject: [PATCH 14/52] Edit version

---
 golem_member_minor/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/golem_member_minor/__manifest__.py b/golem_member_minor/__manifest__.py
index c966b54..419c330 100644
--- a/golem_member_minor/__manifest__.py
+++ b/golem_member_minor/__manifest__.py
@@ -18,7 +18,7 @@
 {
     'name': 'GOLEM members minor',
     'summary': 'GOLEM non-profit members minor management',
-    'version': '10.0.1.1.0',
+    'version': '10.0.1.1.3',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',

From 265f817f904625626398e51c06c4528b55a037ab Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 1 Oct 2018 23:57:22 +0100
Subject: [PATCH 15/52] Migration script

---
 .../migrations/10.0.1.1.3/post-migrate.py     | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 golem_member_minor/migrations/10.0.1.1.3/post-migrate.py

diff --git a/golem_member_minor/migrations/10.0.1.1.3/post-migrate.py b/golem_member_minor/migrations/10.0.1.1.3/post-migrate.py
new file mode 100644
index 0000000..124d0c8
--- /dev/null
+++ b/golem_member_minor/migrations/10.0.1.1.3/post-migrate.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2018 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/>.
+
+""" Post-migration script """
+
+from openupgradelib import openupgrade
+
+@openupgrade.migrate(use_env=False)
+def migrate(cursor, version):
+    """ Recover old legal_gardian_ids and delete their database table  """
+    cursor.execute('SELECT golem_member_id, res_partner_id FROM golem_member_res_partner_rel')
+    for member_id, legal_guardian_id in cursor.fetchall():
+        cursor.execute('''INSERT INTO golem_legal_guardian(member_id, legal_guardian_id) VALUES
+                           (%s, %s)''' % (member_id, legal_guardian_id))
+    cursor.execute('DROP TABLE golem_member_res_partner_rel')

From 709f73a7d16eb12a0fdb45c5d2457d7ccadc3356 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Wed, 3 Oct 2018 22:02:01 +0100
Subject: [PATCH 16/52] check if there is a membership invoice to add
 activities invoice lines

---
 .../golem_activity_registration_invoicing.py  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py b/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py
index d21b3b4..030edc3 100644
--- a/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py
+++ b/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py
@@ -82,13 +82,21 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
         """ Create invoice and lines """
         self.ensure_one()
         partner = self.member_id.partner_id
-        invoice = self.env['account.invoice'].create({
-            'partner_id': partner.id,
-            'account_id': partner.property_account_receivable_id.id,
-            'fiscal_position_id': partner.property_account_position_id.id
-        })
+        #check if there is a draft invoice for the current customer
+        member_line = partner.member_lines.filtered(
+            lambda ml: (ml.membership_id.membership_season_id.is_default and
+                        ml.account_invoice_id.state == 'draft')
+            )
+        if member_line:
+            invoice = member_line[0].account_invoice_id
+        else:
+            invoice = self.env['account.invoice'].create({
+                'partner_id': partner.id,
+                'account_id': partner.property_account_receivable_id.id,
+                'fiscal_position_id': partner.property_account_position_id.id
+                })
         for line in self.line_ids:
-            product = line.activity_id.product_id
+            product = line.activity_id.product_id.product_variant_id
             invoice_line = self._create_invoice_line(product, line.price, invoice)
             line.registration_id.invoice_line_id = invoice_line.id
         return invoice

From eaf48497b21bdd14b9f9b7e4a2ad31188eedbce6 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 5 Oct 2018 15:30:58 +0100
Subject: [PATCH 17/52] Show partner in membership assistant

---
 golem_membership/views/golem_membership_invoice.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/golem_membership/views/golem_membership_invoice.xml b/golem_membership/views/golem_membership_invoice.xml
index 5bce95b..55deeee 100644
--- a/golem_membership/views/golem_membership_invoice.xml
+++ b/golem_membership/views/golem_membership_invoice.xml
@@ -26,6 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="arch" type="xml">
         <form string="Membership Invoice">
           <group>
+            <field name='partner_id'/>
             <field name="product_id" domain="[('membership','=',True)]"
               widget="selection" />
             <field name="member_price" />

From 308ee2e7bd4fe9fc3a8c6d53a039e23b44868e1d Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 5 Oct 2018 15:31:31 +0100
Subject: [PATCH 18/52] include partner in legal_guardian_ids

---
 golem_member/models/golem_member.py       | 28 +++++++++++++++++++++++
 golem_member/views/golem_member_views.xml | 24 ++++++++++++++++---
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py
index b04315b..6321f88 100644
--- a/golem_member/models/golem_member.py
+++ b/golem_member/models/golem_member.py
@@ -22,6 +22,13 @@ from odoo import models, fields, api, _
 from odoo.exceptions import UserError
 _LOGGER = logging.getLogger(__name__)
 
+class golemTest(models.Model):
+    """ Partner Area """
+    _name = 'golem.test'
+
+    partner_id = fields.Many2one('res.partner')
+    nomination = fields.Char()
+    product_id = fields.Many2one('product.product')
 
 class PartnerArea(models.Model):
     """ Partner Area """
@@ -109,6 +116,27 @@ class GolemMember(models.Model):
 
     partner_id = fields.Many2one('res.partner', required=True, index=True,
                                  ondelete='cascade')
+    def membership_invoice_action(self):
+        self.ensure_one()
+        member = self[0]
+        action = self.env.ref('golem_member.golem_membership_invoice_action').read()[0]
+        action['domain'] = [('partner_id', 'in', member.legal_guardian_ids.ids)]
+        return action
+        #action = self.env.ref('golem_member.golem_test_action2').read()[0]
+        #return action
+        #lst = member.legal_guardian_ids.ids
+        #return {
+        #    'name': _('Next activity'),
+        #    'res_model': 'golem.test',
+        #    'context': {},
+        #    'domain' : [('product_id.type', '=', 'service')],
+        #    'type': 'ir.actions.act_window',
+        #    'view_id': False,
+        #    'view_mode': 'form',
+        #    'target': 'new',
+        #    'view_type': 'form'
+        #}
+
 
     @api.model
     def default_season(self):
diff --git a/golem_member/views/golem_member_views.xml b/golem_member/views/golem_member_views.xml
index 11f3bbe..b3da02c 100644
--- a/golem_member/views/golem_member_views.xml
+++ b/golem_member/views/golem_member_views.xml
@@ -28,6 +28,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       res_model="golem.member" view_mode="kanban,tree,form,graph" />
     <act_window id="res_partner_category_action" name="GOLEM Members Tags"
       res_model="res.partner.category" view_mode="tree,form" />
+
+      <act_window id="golem_test_action2"
+        name="Golem Test"
+        res_model="golem.test"
+        view_mode="tree,form"
+        domain="[('partner_id.is_company', '=', False)]"/>
+
+      <!--<record id="golem_test_action" model="ir.actions.act_window">
+          <field name="name">Golem Test</field>
+          <field name="res_model">golem.test</field>
+          <field name="domain">[('partner_id.is_company', '=', False)]</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">tree,form</field>
+      </record>-->
+      <menuitem name="golem test" id="golem_test_menu"
+        action="golem_test_action2" />
+
     <record id="golem_membership_invoice_action" model="ir.actions.act_window">
         <field name="name">Join Membership</field>
         <field name="res_model">golem.membership.invoice</field>
@@ -131,10 +148,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     <div>
                       <field name="partner_id" invisible="True" required="False" />
                       <field name="membership_state"/>
-                      <button name="%(golem_membership_invoice_action)d"
-                        type="action" string="Buy Membership"
+                      <!--"%(golem_membership_invoice_action)d"-->
+                      <!--  <button name="%(golem_test_action2)d"-->
+                        <button name="membership_invoice_action"
+                        type="object" string="Buy Membership"
                         attrs="{'invisible':[('free_member','=',True)]}"
-                        context="{'default_partner_id': partner_id}"
                         class="oe_link"/>
                     </div>
                   </group>

From 9af857a5537c7724f93cfd2e29ce6a1480d09cd5 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Sun, 7 Oct 2018 23:39:01 +0100
Subject: [PATCH 19/52] undo changes

---
 golem_member/views/golem_member_views.xml | 24 +++--------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/golem_member/views/golem_member_views.xml b/golem_member/views/golem_member_views.xml
index b3da02c..75a66e9 100644
--- a/golem_member/views/golem_member_views.xml
+++ b/golem_member/views/golem_member_views.xml
@@ -28,23 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       res_model="golem.member" view_mode="kanban,tree,form,graph" />
     <act_window id="res_partner_category_action" name="GOLEM Members Tags"
       res_model="res.partner.category" view_mode="tree,form" />
-
-      <act_window id="golem_test_action2"
-        name="Golem Test"
-        res_model="golem.test"
-        view_mode="tree,form"
-        domain="[('partner_id.is_company', '=', False)]"/>
-
-      <!--<record id="golem_test_action" model="ir.actions.act_window">
-          <field name="name">Golem Test</field>
-          <field name="res_model">golem.test</field>
-          <field name="domain">[('partner_id.is_company', '=', False)]</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">tree,form</field>
-      </record>-->
-      <menuitem name="golem test" id="golem_test_menu"
-        action="golem_test_action2" />
-
     <record id="golem_membership_invoice_action" model="ir.actions.act_window">
         <field name="name">Join Membership</field>
         <field name="res_model">golem.membership.invoice</field>
@@ -148,11 +131,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     <div>
                       <field name="partner_id" invisible="True" required="False" />
                       <field name="membership_state"/>
-                      <!--"%(golem_membership_invoice_action)d"-->
-                      <!--  <button name="%(golem_test_action2)d"-->
-                        <button name="membership_invoice_action"
-                        type="object" string="Buy Membership"
+                        <button name="%(golem_membership_invoice_action)d"
+                        type="action" string="Buy Membership"
                         attrs="{'invisible':[('free_member','=',True)]}"
+                        context="{'default_partner_id': partner_id}"
                         class="oe_link"/>
                     </div>
                   </group>

From 722756b2a165f80ee18ae84b8004bc76bc48f1d3 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Sun, 7 Oct 2018 23:45:37 +0100
Subject: [PATCH 20/52] undo some changes

---
 golem_member/models/golem_member.py       | 28 -----------------------
 golem_member/views/golem_member_views.xml |  2 +-
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py
index 6321f88..b04315b 100644
--- a/golem_member/models/golem_member.py
+++ b/golem_member/models/golem_member.py
@@ -22,13 +22,6 @@ from odoo import models, fields, api, _
 from odoo.exceptions import UserError
 _LOGGER = logging.getLogger(__name__)
 
-class golemTest(models.Model):
-    """ Partner Area """
-    _name = 'golem.test'
-
-    partner_id = fields.Many2one('res.partner')
-    nomination = fields.Char()
-    product_id = fields.Many2one('product.product')
 
 class PartnerArea(models.Model):
     """ Partner Area """
@@ -116,27 +109,6 @@ class GolemMember(models.Model):
 
     partner_id = fields.Many2one('res.partner', required=True, index=True,
                                  ondelete='cascade')
-    def membership_invoice_action(self):
-        self.ensure_one()
-        member = self[0]
-        action = self.env.ref('golem_member.golem_membership_invoice_action').read()[0]
-        action['domain'] = [('partner_id', 'in', member.legal_guardian_ids.ids)]
-        return action
-        #action = self.env.ref('golem_member.golem_test_action2').read()[0]
-        #return action
-        #lst = member.legal_guardian_ids.ids
-        #return {
-        #    'name': _('Next activity'),
-        #    'res_model': 'golem.test',
-        #    'context': {},
-        #    'domain' : [('product_id.type', '=', 'service')],
-        #    'type': 'ir.actions.act_window',
-        #    'view_id': False,
-        #    'view_mode': 'form',
-        #    'target': 'new',
-        #    'view_type': 'form'
-        #}
-
 
     @api.model
     def default_season(self):
diff --git a/golem_member/views/golem_member_views.xml b/golem_member/views/golem_member_views.xml
index 75a66e9..11f3bbe 100644
--- a/golem_member/views/golem_member_views.xml
+++ b/golem_member/views/golem_member_views.xml
@@ -131,7 +131,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     <div>
                       <field name="partner_id" invisible="True" required="False" />
                       <field name="membership_state"/>
-                        <button name="%(golem_membership_invoice_action)d"
+                      <button name="%(golem_membership_invoice_action)d"
                         type="action" string="Buy Membership"
                         attrs="{'invisible':[('free_member','=',True)]}"
                         context="{'default_partner_id': partner_id}"

From a0f56faac46566753381401b47ebce12ad73879e Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Sun, 7 Oct 2018 23:57:17 +0100
Subject: [PATCH 21/52] undo some changes

---
 golem_membership/views/golem_membership_invoice.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/golem_membership/views/golem_membership_invoice.xml b/golem_membership/views/golem_membership_invoice.xml
index 55deeee..5bce95b 100644
--- a/golem_membership/views/golem_membership_invoice.xml
+++ b/golem_membership/views/golem_membership_invoice.xml
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="arch" type="xml">
         <form string="Membership Invoice">
           <group>
-            <field name='partner_id'/>
             <field name="product_id" domain="[('membership','=',True)]"
               widget="selection" />
             <field name="member_price" />

From d0a5bbe6a0aaf9c950bb98bb9b0fcf87f5d1a648 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 8 Oct 2018 02:46:26 +0100
Subject: [PATCH 22/52] Edit __manifest__

---
 golem_member_minor/__manifest__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/golem_member_minor/__manifest__.py b/golem_member_minor/__manifest__.py
index c966b54..d2830d9 100644
--- a/golem_member_minor/__manifest__.py
+++ b/golem_member_minor/__manifest__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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
@@ -25,5 +26,6 @@
     'application': False,
     'installable': True,
     'depends': ['golem_member'],
-    'data': ['views/golem_member_views.xml']
+    'data': ['views/golem_member_views.xml',
+             'views/golem_membership_invoice.xml']
 }

From 17eb52ac289c7e6230a8c586bf874fb456b47914 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 8 Oct 2018 02:47:18 +0100
Subject: [PATCH 23/52] Show partner_id and src_member_id in the wizard form

---
 .../views/golem_membership_invoice.xml        | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 golem_member_minor/views/golem_membership_invoice.xml

diff --git a/golem_member_minor/views/golem_membership_invoice.xml b/golem_member_minor/views/golem_membership_invoice.xml
new file mode 100644
index 0000000..c9ba6f4
--- /dev/null
+++ b/golem_member_minor/views/golem_membership_invoice.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Youssef El Ouahby <youssef@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>
+  <data>
+    <!-- Forms -->
+    <record id="golem_membership_invoice_form_inherit" model="ir.ui.view">
+      <field name="name">membership.invoice.view.form_iherit</field>
+      <field name="model">golem.membership.invoice</field>
+      <field name="inherit_id" ref="golem_membership.golem_membership_invoice_form" />
+      <field name="arch" type="xml">
+        <field name='product_id' position='before'>
+            <field name='partner_id'
+                   attrs="{'invisible': [('src_member_id', '=', False)]}"
+                   options="{'no_create': True}"/>
+            <field name='src_member_id' invisible="1"/>
+        </field>
+      </field>
+    </record>
+  </data>
+</odoo>

From f82ffa68dd3b12bdf875b724153022bf45b0126c Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 8 Oct 2018 02:48:11 +0100
Subject: [PATCH 24/52] Extend the Buy membership button

---
 golem_member_minor/views/golem_member_views.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/golem_member_minor/views/golem_member_views.xml b/golem_member_minor/views/golem_member_views.xml
index 412df59..b5582b8 100644
--- a/golem_member_minor/views/golem_member_views.xml
+++ b/golem_member_minor/views/golem_member_views.xml
@@ -2,6 +2,7 @@
 
 <!--
 Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Youssef El Ouahby <youssef@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
@@ -47,6 +48,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             </group>
           </page>
         </page>
+        <xpath expr="//page[@name='membership']/group/group/div/button[1]" position="attributes">
+          <attribute name="name">membership_invoice_action</attribute>
+          <attribute name="type">object</attribute>
+        </xpath>
       </field>
     </record>
 

From ec2b1c5c493d5cc57ada34326d3eef5d41fa2cd1 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 8 Oct 2018 02:48:49 +0100
Subject: [PATCH 25/52] Add src_member_id and partner_id domain in membership
 wizard

---
 golem_member_minor/models/golem_membership.py | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 golem_member_minor/models/golem_membership.py

diff --git a/golem_member_minor/models/golem_membership.py b/golem_member_minor/models/golem_membership.py
new file mode 100644
index 0000000..2b736ae
--- /dev/null
+++ b/golem_member_minor/models/golem_membership.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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/>.
+
+""" GOLEM Membership """
+
+from odoo import models, fields, api
+from odoo.addons import decimal_precision as dp
+
+
+class GolemMembershipInvoice(models.TransientModel):
+    """ Membership invoicing """
+    _inherit = 'golem.membership.invoice'
+
+
+    src_member_id = fields.Many2one('golem.member')
+    partner_id = fields.Many2one(required=True)
+
+    @api.onchange('src_member_id')
+    def onchange_member(self):
+        """ Set partner domain if src_member_id is filled """
+        record = self[0]
+        if record.src_member_id.is_minor:
+            return {'domain': {'partner_id':
+                               [('id', 'in', record.src_member_id.legal_guardian_ids.ids)]
+                              }
+                   }

From 3793e1dda31f8e5a5dc26693209730d3a96bcd6a Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 8 Oct 2018 02:49:28 +0100
Subject: [PATCH 26/52] Add membership_invoice_action for minor members

---
 golem_member_minor/models/golem_member.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/golem_member_minor/models/golem_member.py b/golem_member_minor/models/golem_member.py
index ab31550..670d603 100644
--- a/golem_member_minor/models/golem_member.py
+++ b/golem_member_minor/models/golem_member.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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
@@ -52,3 +53,12 @@ class GolemMember(models.Model):
         else:
             operator = '<=' if value else '>'
         return [('birthdate_date', operator, adult_date)]
+
+    def membership_invoice_action(self):
+        self.ensure_one()
+        member = self[0]
+        action = self.env.ref('golem_member.golem_membership_invoice_action').read()[0]
+        if member.is_minor:
+            action['context'] = {'default_src_member_id': member.id,
+                                 'default_partner_id': False}
+        return action

From 9a36a90c801b06ca4314ddd02d413f9331c01a58 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 8 Oct 2018 02:49:49 +0100
Subject: [PATCH 27/52] Edit __init__

---
 golem_member_minor/models/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/golem_member_minor/models/__init__.py b/golem_member_minor/models/__init__.py
index f4e5ac9..b559e11 100644
--- a/golem_member_minor/models/__init__.py
+++ b/golem_member_minor/models/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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
@@ -15,4 +16,4 @@
 #    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
+from . import golem_member, golem_membership

From 841d91bb4181fa2dde7d590178ec0a3592546b39 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 8 Oct 2018 02:50:58 +0100
Subject: [PATCH 28/52] code refactoring

---
 golem_member_minor/models/golem_member.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/golem_member_minor/models/golem_member.py b/golem_member_minor/models/golem_member.py
index 670d603..34368b8 100644
--- a/golem_member_minor/models/golem_member.py
+++ b/golem_member_minor/models/golem_member.py
@@ -55,6 +55,7 @@ class GolemMember(models.Model):
         return [('birthdate_date', operator, adult_date)]
 
     def membership_invoice_action(self):
+        """ Membership invoice action for minor member """
         self.ensure_one()
         member = self[0]
         action = self.env.ref('golem_member.golem_membership_invoice_action').read()[0]

From afddb3c58dd2bd8f82ad983c2ce2f6139973a0d9 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Mon, 8 Oct 2018 14:37:14 +0100
Subject: [PATCH 29/52] Add partner_ids to account_invoice

---
 golem_member_minor/__manifest__.py            |  3 +-
 golem_member_minor/models/__init__.py         |  2 +-
 golem_member_minor/models/account_invoice.py  | 27 +++++++++++++
 golem_member_minor/models/golem_membership.py | 15 ++++++++
 golem_member_minor/views/account_invoice.xml  | 38 +++++++++++++++++++
 5 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 golem_member_minor/models/account_invoice.py
 create mode 100644 golem_member_minor/views/account_invoice.xml

diff --git a/golem_member_minor/__manifest__.py b/golem_member_minor/__manifest__.py
index d2830d9..62874fb 100644
--- a/golem_member_minor/__manifest__.py
+++ b/golem_member_minor/__manifest__.py
@@ -27,5 +27,6 @@
     'installable': True,
     'depends': ['golem_member'],
     'data': ['views/golem_member_views.xml',
-             'views/golem_membership_invoice.xml']
+             'views/golem_membership_invoice.xml',
+             'views/account_invoice.xml']
 }
diff --git a/golem_member_minor/models/__init__.py b/golem_member_minor/models/__init__.py
index b559e11..22440e6 100644
--- a/golem_member_minor/models/__init__.py
+++ b/golem_member_minor/models/__init__.py
@@ -16,4 +16,4 @@
 #    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, golem_membership
+from . import golem_member, golem_membership, account_invoice
diff --git a/golem_member_minor/models/account_invoice.py b/golem_member_minor/models/account_invoice.py
new file mode 100644
index 0000000..69b4417
--- /dev/null
+++ b/golem_member_minor/models/account_invoice.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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/>.
+
+""" Account Invoice adaptations """
+
+from odoo import models, fields, api
+
+class AccountInvoice(models.Model):
+    """ Account Invoice adaptations """
+    _inherit = 'account.invoice'
+
+    partner_ids = fields.Many2many('res.partner')
diff --git a/golem_member_minor/models/golem_membership.py b/golem_member_minor/models/golem_membership.py
index 2b736ae..aa5b808 100644
--- a/golem_member_minor/models/golem_membership.py
+++ b/golem_member_minor/models/golem_membership.py
@@ -39,3 +39,18 @@ class GolemMembershipInvoice(models.TransientModel):
                                [('id', 'in', record.src_member_id.legal_guardian_ids.ids)]
                               }
                    }
+    @api.multi
+    def membership_invoice(self):
+        """ Create invoice and redirect to partner invoice list """
+        self.ensure_one()
+        res = super(GolemMembershipInvoice, self).membership_invoice()
+        if self.src_member_id and self.src_member_id.is_minor:
+            invoice_id = (res['domain'][0][2] if
+                          res['domain'][0][2] else False)
+            if invoice_id:
+                self.env['account.invoice'].browse(invoice_id).partner_ids = [
+                    (6, 0, [self.partner_id.id,
+                            self.src_member_id.partner_id.id])]
+            self.src_member_id.partner_id.membership_state = self.partner_id.membership_state
+            self.partner_id.membership_state = 'none'
+        return res
diff --git a/golem_member_minor/views/account_invoice.xml b/golem_member_minor/views/account_invoice.xml
new file mode 100644
index 0000000..b441ed1
--- /dev/null
+++ b/golem_member_minor/views/account_invoice.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Youssef El Ouahby <youssef@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>
+  <data>
+    <!-- Forms -->
+    <record id="account.invoice_form_inherited_member_minor" model="ir.ui.view">
+      <field name="name">account.invoice.form.iherited.member.minor</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.invoice_form" />
+      <field name="arch" type="xml">
+        <field name='partner_id' position='after'>
+            <field name="partner_ids"
+                   widget="many2many_tags"
+                   readonly="1"/>
+                  <!-- attrs="{'invisible': [('src_member_id', '=', False)]}"-->
+        </field>
+      </field>
+    </record>
+  </data>
+</odoo>

From 5ac133165257d2a033a9c28fc72d420818d56377 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Tue, 9 Oct 2018 14:35:40 +0100
Subject: [PATCH 30/52] code refactoring

---
 golem_member_minor/models/account_invoice.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/golem_member_minor/models/account_invoice.py b/golem_member_minor/models/account_invoice.py
index 69b4417..ea32f07 100644
--- a/golem_member_minor/models/account_invoice.py
+++ b/golem_member_minor/models/account_invoice.py
@@ -24,4 +24,5 @@ class AccountInvoice(models.Model):
     """ Account Invoice adaptations """
     _inherit = 'account.invoice'
 
-    partner_ids = fields.Many2many('res.partner')
+    partner_ids = fields.Many2many('res.partner', string="Concerned partners")
+    is_minor_invoice = fields.Boolean()

From 6307329e981bb004d78568651cd2f342aa0f1f15 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Tue, 9 Oct 2018 14:36:24 +0100
Subject: [PATCH 31/52] move membership from the legal_guardian to the minor

---
 golem_member_minor/models/golem_membership.py | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/golem_member_minor/models/golem_membership.py b/golem_member_minor/models/golem_membership.py
index aa5b808..512ab0e 100644
--- a/golem_member_minor/models/golem_membership.py
+++ b/golem_member_minor/models/golem_membership.py
@@ -19,7 +19,6 @@
 """ GOLEM Membership """
 
 from odoo import models, fields, api
-from odoo.addons import decimal_precision as dp
 
 
 class GolemMembershipInvoice(models.TransientModel):
@@ -41,16 +40,21 @@ class GolemMembershipInvoice(models.TransientModel):
                    }
     @api.multi
     def membership_invoice(self):
-        """ Create invoice and redirect to partner invoice list """
+        """ Add partners concerned to invoice and move membership from legal guardian to minor """
         self.ensure_one()
+        record = self[0]
         res = super(GolemMembershipInvoice, self).membership_invoice()
-        if self.src_member_id and self.src_member_id.is_minor:
+        if record.src_member_id and record.src_member_id.is_minor:
+            #gettin invoice_id from action's domain already declared
             invoice_id = (res['domain'][0][2] if
                           res['domain'][0][2] else False)
             if invoice_id:
-                self.env['account.invoice'].browse(invoice_id).partner_ids = [
-                    (6, 0, [self.partner_id.id,
-                            self.src_member_id.partner_id.id])]
-            self.src_member_id.partner_id.membership_state = self.partner_id.membership_state
-            self.partner_id.membership_state = 'none'
+                invoice = self.env['account.invoice'].browse(invoice_id)
+                invoice.is_minor_invoice = True
+                invoice.partner_ids = [(6, 0, [record.partner_id.id,
+                                               record.src_member_id.partner_id.id])]
+            # move the created membership from legal guardian to the minor
+            membership_line = record.partner_id.member_lines[0]
+            membership_line.copy({'partner': record.src_member_id.partner_id.id})
+            membership_line.unlink()
         return res

From 561786430a2b548b3607144b5f4f6a5afa96f675 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Tue, 9 Oct 2018 14:37:23 +0100
Subject: [PATCH 32/52] invoice form improvement

---
 golem_member_minor/views/account_invoice.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/golem_member_minor/views/account_invoice.xml b/golem_member_minor/views/account_invoice.xml
index b441ed1..5183a51 100644
--- a/golem_member_minor/views/account_invoice.xml
+++ b/golem_member_minor/views/account_invoice.xml
@@ -27,10 +27,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="inherit_id" ref="account.invoice_form" />
       <field name="arch" type="xml">
         <field name='partner_id' position='after'>
+            <field name='is_minor_invoice' invisible="1"/>
             <field name="partner_ids"
                    widget="many2many_tags"
-                   readonly="1"/>
-                  <!-- attrs="{'invisible': [('src_member_id', '=', False)]}"-->
+                   readonly="1"
+                   attrs="{'invisible': [('is_minor_invoice', '=', False)]}"/>
         </field>
       </field>
     </record>

From 0d24d6d69da041934ca1be8655b9ad1ea9f39a23 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Thu, 11 Oct 2018 16:45:16 +0100
Subject: [PATCH 33/52] Create Area.street model

---
 .../models/golem_partner_area_street.py       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 golem_member/models/golem_partner_area_street.py

diff --git a/golem_member/models/golem_partner_area_street.py b/golem_member/models/golem_partner_area_street.py
new file mode 100644
index 0000000..3a61d3c
--- /dev/null
+++ b/golem_member/models/golem_partner_area_street.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
+#    Copyright 2018 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/>.
+
+""" GOLEM Partner Area Street Management """
+
+from odoo import models, fields, api
+
+
+class GolemPartnerAreaStreet(models.Model):
+    """ GOLEM Partner Area Street Management """
+    _name = 'golem.partner.area.street'
+    _description = 'GOLEM Partner Area Street'
+
+    name = fields.Char()
+    area_id = fields.Many2one('golem.partner.area', required=True,
+                              index=True, auto_join=True)

From 667de88bd86bde201505a8359edc3c1d466ba115 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Thu, 11 Oct 2018 16:45:34 +0100
Subject: [PATCH 34/52] Edit models/__init__

---
 golem_member/models/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/golem_member/models/__init__.py b/golem_member/models/__init__.py
index e52d006..a3469d5 100644
--- a/golem_member/models/__init__.py
+++ b/golem_member/models/__init__.py
@@ -15,4 +15,4 @@
 #    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, golem_season
+from . import golem_member, golem_season, golem_partner_area_street

From 61411705ebe2c08f5bdc3dd9f812c8a2fc3178f9 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Thu, 11 Oct 2018 17:24:47 +0100
Subject: [PATCH 35/52] Add area Form

---
 .../views/golem_partner_area_views.xml        | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/golem_member/views/golem_partner_area_views.xml b/golem_member/views/golem_partner_area_views.xml
index fb7c057..efdf406 100644
--- a/golem_member/views/golem_partner_area_views.xml
+++ b/golem_member/views/golem_partner_area_views.xml
@@ -24,13 +24,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="name">GOLEM Partner Area Tree</field>
       <field name="model">golem.partner.area</field>
       <field name="arch" type="xml">
-        <tree editable="bottom">
+        <tree>
           <field name="sequence" widget="handle" />
           <field name="name" />
         </tree>
       </field>
     </record>
 
+    <!-- Form -->
+    <record model="ir.ui.view" id="golem_partner_area_view_form">
+      <field name="name">GOLEM Partner Area Form</field>
+      <field name="model">golem.partner.area</field>
+      <field name="arch" type="xml">
+        <form>
+          <group>
+            <field name="name"/>
+            <field name="area_street_ids">
+              <tree editable="bottom">
+                <field name="name"/>
+              </tree>
+            </field>
+          </group>
+        </form>
+      </field>
+    </record>
+
     <!-- Search -->
     <record id="golem_partner_area_view_search" model="ir.ui.view">
       <field name="name">GOLEM Partner Area Search</field>
@@ -44,7 +62,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <!-- Actions -->
     <act_window id="golem_partner_area_action"
-      name="Areas" res_model="golem.partner.area" view_mode="tree" />
+      name="Areas" res_model="golem.partner.area"
+      view_mode="tree,form" />
 
     <!-- Menus -->
     <menuitem id="golem_partner_area_menu" name="Areas"

From 6d8863565e109e3167cf0958b6cb512407759759 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Thu, 11 Oct 2018 23:50:22 +0100
Subject: [PATCH 36/52] save street with the area

---
 golem_member/models/golem_member.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py
index b04315b..36f4561 100644
--- a/golem_member/models/golem_member.py
+++ b/golem_member/models/golem_member.py
@@ -34,6 +34,8 @@ class PartnerArea(models.Model):
 
     name = fields.Char(required=True, index=True)
     sequence = fields.Integer()
+    area_street_ids = fields.One2many('golem.partner.area.street', 'area_id',
+                                      string="street list")
 
 
 class ResPartner(models.Model):
@@ -83,6 +85,18 @@ class ResPartner(models.Model):
         gm_obj = self.env['golem.member']
         gm_obj.create({'partner_id': self[0].id})
 
+    @api.multi
+    @api.constrains('street')
+    def save_street(self):
+        """ Save street if no exist """
+        for member in self:
+            if member.street:
+                street = self.env['golem.partner.area.street'].search([
+                    ('name', 'ilike', member.street)])
+                if not street:
+                    self.env['golem.partner.area.street'].create({'name': member.street,
+                                                                  'area_id': member.area_id.id})
+
 class GolemMembershipInvoice(models.TransientModel):
     """ GOLEM Membership Invoice adaptations """
     _inherit = 'golem.membership.invoice'
@@ -257,6 +271,14 @@ class GolemMember(models.Model):
             self.generate_number()
         return res
 
+    @api.onchange('street')
+    def onchange_street(self):
+        """ Area auto assignement """
+        self.ensure_one()
+        member = self[0]
+        street = self.env['golem.partner.area.street'].search([('name', 'ilike', member.street)])
+        if street:
+            member.area_id = street[0].area_id
 
 class GolemMemberNumber(models.Model):
     """ GOLEM Member Numbers """

From 2eda76a20d2484cb9b14d7711b41555b9990f34e Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Thu, 11 Oct 2018 23:50:47 +0100
Subject: [PATCH 37/52] small improvement

---
 golem_member/models/golem_partner_area_street.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/golem_member/models/golem_partner_area_street.py b/golem_member/models/golem_partner_area_street.py
index 3a61d3c..af51e78 100644
--- a/golem_member/models/golem_partner_area_street.py
+++ b/golem_member/models/golem_partner_area_street.py
@@ -26,6 +26,6 @@ class GolemPartnerAreaStreet(models.Model):
     _name = 'golem.partner.area.street'
     _description = 'GOLEM Partner Area Street'
 
-    name = fields.Char()
+    name = fields.Char(required=True)
     area_id = fields.Many2one('golem.partner.area', required=True,
-                              index=True, auto_join=True)
+                              index=True, auto_join=True, ondelete="set null")

From 35c54abc15af6b0a9f38c2d46d2c6fcbce0d131e Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 12 Oct 2018 01:48:10 +0100
Subject: [PATCH 38/52] Code refactoring and improvement

---
 golem_member/models/golem_member.py           |  4 +++
 .../views/golem_partner_area_views.xml        | 26 ++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py
index 36f4561..7f1daca 100644
--- a/golem_member/models/golem_member.py
+++ b/golem_member/models/golem_member.py
@@ -36,6 +36,10 @@ class PartnerArea(models.Model):
     sequence = fields.Integer()
     area_street_ids = fields.One2many('golem.partner.area.street', 'area_id',
                                       string="street list")
+    parent_id = fields.Many2one('golem.partner.area', string="Parent Territory",
+                                domain="[('id', '!=', id)]")
+    sub_territorie_ids = fields.One2many('golem.partner.area', 'parent_id',
+                                         string="Sub Territories List")
 
 
 class ResPartner(models.Model):
diff --git a/golem_member/views/golem_partner_area_views.xml b/golem_member/views/golem_partner_area_views.xml
index efdf406..dbf498b 100644
--- a/golem_member/views/golem_partner_area_views.xml
+++ b/golem_member/views/golem_partner_area_views.xml
@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <tree>
           <field name="sequence" widget="handle" />
           <field name="name" />
+          <field name="parent_id"/>
         </tree>
       </field>
     </record>
@@ -38,12 +39,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="arch" type="xml">
         <form>
           <group>
-            <field name="name"/>
-            <field name="area_street_ids">
-              <tree editable="bottom">
-                <field name="name"/>
-              </tree>
-            </field>
+            <group>
+              <field name="name"/>
+              <field name="area_street_ids">
+                <tree editable="bottom">
+                  <field name="name"/>
+                </tree>
+              </field>
+            </group>
+            <group>
+              <field name="parent_id"/>
+              <field name="sub_territorie_ids" widget="many2many_tags"/>
+            </group>
           </group>
         </form>
       </field>
@@ -55,7 +62,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="model">golem.partner.area</field>
       <field name="arch" type="xml">
         <search>
-          <field name="name" />
+          <field name="name"/>
+          <field name="parent_id"/>
+          <filter name="sub_territories" string="Sub Territories"
+            domain="[('parent_id', '!=', False)]"/>
+          <filter name="parent_territories" string="Parent Territories"
+            domain="[('sub_territorie_ids', '!=', False)]"/>
         </search>
       </field>
     </record>

From 03819f5f3c73761661dded814c0b448d62bdfb04 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 12 Oct 2018 02:48:12 +0100
Subject: [PATCH 39/52] remove sub area from price line

---
 .../models/golem_activity.py                                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/golem_activity_registration_custom_price/models/golem_activity.py b/golem_activity_registration_custom_price/models/golem_activity.py
index f2cd473..4f08f40 100644
--- a/golem_activity_registration_custom_price/models/golem_activity.py
+++ b/golem_activity_registration_custom_price/models/golem_activity.py
@@ -43,7 +43,7 @@ class GolemActivity(models.Model):
         existing_combinations = [u'%s-%s' % (line.area_id.id, line.slice_id.id)
                                  for line in activity.price_line_ids]
         slice_ids = self.env['golem.payment.rule.familyquotient.slice'].search([])
-        for area_id in self.env['golem.partner.area'].search([]):
+        for area_id in self.env['golem.partner.area'].search([('parent_id', '=', False)]):
             for slice_id in slice_ids:
                 combination = u'%s-%s' % (area_id.id, slice_id.id)
                 if combination not in existing_combinations:

From 71f7299aaf6b9601bf6986b42b6f0bdc9739f702 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 12 Oct 2018 16:05:01 +0100
Subject: [PATCH 40/52] Change member.area_id to area_id.root_id

---
 golem_activity_registration_custom_price/models/golem_member.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/golem_activity_registration_custom_price/models/golem_member.py b/golem_activity_registration_custom_price/models/golem_member.py
index 1ce0130..ebac655 100644
--- a/golem_activity_registration_custom_price/models/golem_member.py
+++ b/golem_activity_registration_custom_price/models/golem_member.py
@@ -40,7 +40,7 @@ class GolemMember(models.Model):
                 area_ids = self.env['golem.partner.area'].search([])
                 if member.area_id:
                     applicable_areas += area_ids.filtered(
-                        lambda r: r == member.area_id
+                        lambda r: r == member.area_id.root_id
                     )
                 if not applicable_areas and area_ids:
                     applicable_areas += area_ids[0]

From ace87392db1d17d6b1b1ffd1f54d88719d9d561c Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 12 Oct 2018 16:06:18 +0100
Subject: [PATCH 41/52] compute root area

---
 golem_member/models/golem_member.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py
index 7f1daca..c0d9afd 100644
--- a/golem_member/models/golem_member.py
+++ b/golem_member/models/golem_member.py
@@ -22,6 +22,12 @@ from odoo import models, fields, api, _
 from odoo.exceptions import UserError
 _LOGGER = logging.getLogger(__name__)
 
+def get_root_area(area_id):
+    """ Get root area """
+    if not area_id.parent_id:
+        return area_id
+    else:
+        return get_root_area(area_id.parent_id)
 
 class PartnerArea(models.Model):
     """ Partner Area """
@@ -38,8 +44,14 @@ class PartnerArea(models.Model):
                                       string="street list")
     parent_id = fields.Many2one('golem.partner.area', string="Parent Territory",
                                 domain="[('id', '!=', id)]")
-    sub_territorie_ids = fields.One2many('golem.partner.area', 'parent_id',
-                                         string="Sub Territories List")
+    root_id = fields.Many2one('golem.partner.area', compute="_compute_root_id",
+                              string="Root area")
+
+    @api.depends('parent_id')
+    def _compute_root_id(self):
+        """ Compute root_id """
+        for area in self:
+            area.root_id = get_root_area(area)
 
 
 class ResPartner(models.Model):

From 1bcb4ff5bb149b4acfb2c7bd960dfe07df15580e Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 12 Oct 2018 17:16:44 +0100
Subject: [PATCH 42/52] small refactoring

---
 golem_member/views/golem_partner_area_views.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/golem_member/views/golem_partner_area_views.xml b/golem_member/views/golem_partner_area_views.xml
index dbf498b..2a70c61 100644
--- a/golem_member/views/golem_partner_area_views.xml
+++ b/golem_member/views/golem_partner_area_views.xml
@@ -39,18 +39,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="arch" type="xml">
         <form>
           <group>
-            <group>
               <field name="name"/>
+              <field name="parent_id"/>
+              <field name="root_id"/>
               <field name="area_street_ids">
                 <tree editable="bottom">
                   <field name="name"/>
                 </tree>
               </field>
-            </group>
-            <group>
-              <field name="parent_id"/>
-              <field name="sub_territorie_ids" widget="many2many_tags"/>
-            </group>
           </group>
         </form>
       </field>
@@ -67,7 +63,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <filter name="sub_territories" string="Sub Territories"
             domain="[('parent_id', '!=', False)]"/>
           <filter name="parent_territories" string="Parent Territories"
-            domain="[('sub_territorie_ids', '!=', False)]"/>
+            domain="[('parent_id', '=', False)]"/>
         </search>
       </field>
     </record>

From 201109021d6733a53b3721edb2732393ca01a7de Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Fri, 12 Oct 2018 17:17:24 +0100
Subject: [PATCH 43/52] prevent loop in area parenting

---
 golem_member/models/golem_member.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py
index c0d9afd..0ef0885 100644
--- a/golem_member/models/golem_member.py
+++ b/golem_member/models/golem_member.py
@@ -19,7 +19,7 @@
 
 import logging
 from odoo import models, fields, api, _
-from odoo.exceptions import UserError
+from odoo.exceptions import UserError, ValidationError
 _LOGGER = logging.getLogger(__name__)
 
 def get_root_area(area_id):
@@ -29,6 +29,15 @@ def get_root_area(area_id):
     else:
         return get_root_area(area_id.parent_id)
 
+def is_sub_area(area_id, parent_id):
+    """ Check if parent is sub area """
+    if parent_id.parent_id.id == area_id.id:
+        return True
+    elif not parent_id.parent_id:
+        return False
+    else:
+        return is_sub_area(area_id, parent_id.parent_id)
+
 class PartnerArea(models.Model):
     """ Partner Area """
     _name = 'golem.partner.area'
@@ -53,6 +62,13 @@ class PartnerArea(models.Model):
         for area in self:
             area.root_id = get_root_area(area)
 
+    @api.constrains('parent_id')
+    def check_parent_id(self):
+        """ Check if parent is sub area """
+        for area in self:
+            if  is_sub_area(area, area.parent_id):
+                err = _("The parent area is a sub area of the current area, please change it")
+                raise ValidationError(err)
 
 class ResPartner(models.Model):
     """ GOLEM Member partner adaptations """

From cc479d3908149883ed50b38630296ddd2bca66a8 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Fri, 19 Oct 2018 09:04:54 +0200
Subject: [PATCH 44/52] [REF][IMP]GOLEM Family single-parent small enhancements

---
 golem_family/__manifest__.py              |  4 ++--
 golem_family/i18n/fr.po                   | 19 +++++++++++++++----
 golem_family/i18n/golem_family.pot        | 18 ++++++++++++++----
 golem_family/models/golem_family.py       |  6 +++---
 golem_family/views/golem_family_views.xml | 10 ++++++----
 5 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/golem_family/__manifest__.py b/golem_family/__manifest__.py
index 17588f8..21b0107 100644
--- a/golem_family/__manifest__.py
+++ b/golem_family/__manifest__.py
@@ -19,9 +19,9 @@
     'name': 'GOLEM families',
     'summary': 'GOLEM Members Families',
     'description': 'GOLEM Members Families',
-    'version': '10.0.2.3.1',
+    'version': '10.0.2.4.0',
     'category': 'GOLEM',
-    'author': 'Fabien Bourgeois',
+    'author': 'Fabien Bourgeois, Youssef El Ouahby',
     'license': 'AGPL-3',
     'application': False,
     'installable': True,
diff --git a/golem_family/i18n/fr.po b/golem_family/i18n/fr.po
index 5617a4c..062d970 100644
--- a/golem_family/i18n/fr.po
+++ b/golem_family/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-01 10:12+0000\n"
-"PO-Revision-Date: 2018-08-01 12:15+0200\n"
+"POT-Creation-Date: 2018-10-19 07:03+0000\n"
+"PO-Revision-Date: 2018-10-19 09:04+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -145,8 +145,8 @@ msgid "Family"
 msgstr "Famille"
 
 #. module: golem_family
-#: code:addons/golem_family/models/golem_family.py:50
-#: code:addons/golem_family/models/golem_family.py:84
+#: code:addons/golem_family/models/golem_family.py:49
+#: code:addons/golem_family/models/golem_family.py:83
 #, python-format
 msgid "Family Members"
 msgstr "Membres de la famille"
@@ -308,6 +308,16 @@ msgstr "Role"
 msgid "Roles"
 msgstr "Roles"
 
+#. module: golem_family
+#: model:ir.model.fields,field_description:golem_family.field_golem_family_single_parent
+msgid "Single parent"
+msgstr "Monoparentale"
+
+#. module: golem_family
+#: model:ir.ui.view,arch_db:golem_family.golem_family_search
+msgid "Single-parent"
+msgstr "Monoparentale"
+
 #. module: golem_family
 #: model:ir.model.fields,field_description:golem_family.field_golem_family_state_id
 #: model:ir.model.fields,field_description:golem_family.field_golem_member_family_state_id
@@ -388,3 +398,4 @@ msgstr "membres"
 #: model:ir.ui.view,arch_db:golem_family.golem_member_form_inherit_golem_family
 msgid "name@example.org"
 msgstr "name@example.org"
+
diff --git a/golem_family/i18n/golem_family.pot b/golem_family/i18n/golem_family.pot
index 94e3088..b77ee95 100644
--- a/golem_family/i18n/golem_family.pot
+++ b/golem_family/i18n/golem_family.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-01 10:12+0000\n"
-"PO-Revision-Date: 2018-08-01 10:12+0000\n"
+"POT-Creation-Date: 2018-10-19 07:03+0000\n"
+"PO-Revision-Date: 2018-10-19 07:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -145,8 +145,8 @@ msgid "Family"
 msgstr ""
 
 #. module: golem_family
-#: code:addons/golem_family/models/golem_family.py:50
-#: code:addons/golem_family/models/golem_family.py:84
+#: code:addons/golem_family/models/golem_family.py:49
+#: code:addons/golem_family/models/golem_family.py:83
 #, python-format
 msgid "Family Members"
 msgstr ""
@@ -308,6 +308,16 @@ msgstr ""
 msgid "Roles"
 msgstr ""
 
+#. module: golem_family
+#: model:ir.model.fields,field_description:golem_family.field_golem_family_single_parent
+msgid "Single parent"
+msgstr ""
+
+#. module: golem_family
+#: model:ir.ui.view,arch_db:golem_family.golem_family_search
+msgid "Single-parent"
+msgstr ""
+
 #. module: golem_family
 #: model:ir.model.fields,field_description:golem_family.field_golem_family_state_id
 #: model:ir.model.fields,field_description:golem_family.field_golem_member_family_state_id
diff --git a/golem_family/models/golem_family.py b/golem_family/models/golem_family.py
index 505dc9c..d6c1c16 100644
--- a/golem_family/models/golem_family.py
+++ b/golem_family/models/golem_family.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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
@@ -140,11 +141,10 @@ class GolemFamily(models.Model):
 
     member_ids = fields.One2many('res.partner', 'family_id', 'Members',
                                  domain=[('is_company', '=', False)])
+    single_parent = fields.Boolean()
     note = fields.Text()
     count = fields.Integer(compute='_compute_count', store=True)
 
-    single_parent = fields.Boolean()
-
     @api.depends('member_ids')
     def _compute_count(self):
         for family in self:
diff --git a/golem_family/views/golem_family_views.xml b/golem_family/views/golem_family_views.xml
index 2900161..04ba706 100644
--- a/golem_family/views/golem_family_views.xml
+++ b/golem_family/views/golem_family_views.xml
@@ -2,6 +2,7 @@
 
 <!--
 Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Youssef El Ouahby <youssef@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
@@ -34,10 +35,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                   <label for="name" string="Family" class="oe_edit_only" />
                   <field name="name" class="oe_inline" placeholder="Name" />
                 </h1>
-                <label for="single_parent" string="Single-Parent Family"/>
-                <field name="single_parent"/>
               </div>
             </group>
+            <group>
+              <field name="single_parent" />
+            </group>
             <group string="Address">
               <group>
                 <field name="street" placeholder="Street..." />
@@ -189,8 +191,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <field name="phone" />
           <field name="mobile" />
           <field name="email" />
-          <filter name="single_parent" string="Single-parent Family"
-            domain="[('single_parent', '=', True)]"/>
+          <filter name="single_parent" string="Single-parent"
+            domain="[('single_parent', '=', True)]" />
           <group string="Group By">
             <filter name="group_city" string="By city"
               context="{'group_by': 'city'}"/>

From 04f383a951f5d44d6b494ebf51a3a565fced3e8b Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Mon, 22 Oct 2018 18:10:44 +0200
Subject: [PATCH 45/52] [REF]GOLEM Member / Custom Price : territories
 enhancements

Global refactoring : small enhancements from MR code + ACLs + french i18n
---
 .../__manifest__.py                           |  4 +-
 .../models/golem_activity.py                  |  1 +
 .../models/golem_member.py                    |  1 +
 golem_member/__manifest__.py                  |  2 +-
 golem_member/i18n/fr.po                       | 91 ++++++++++++++++---
 golem_member/i18n/golem_member.pot            | 87 +++++++++++++++---
 golem_member/models/__init__.py               |  2 +-
 golem_member/models/golem_member.py           | 75 +++++++++------
 .../models/golem_partner_area_street.py       | 31 -------
 golem_member/security/ir.model.access.csv     |  1 +
 .../views/golem_partner_area_views.xml        | 40 ++++----
 11 files changed, 228 insertions(+), 107 deletions(-)
 delete mode 100644 golem_member/models/golem_partner_area_street.py

diff --git a/golem_activity_registration_custom_price/__manifest__.py b/golem_activity_registration_custom_price/__manifest__.py
index c84a32e..59853a3 100644
--- a/golem_activity_registration_custom_price/__manifest__.py
+++ b/golem_activity_registration_custom_price/__manifest__.py
@@ -20,11 +20,11 @@
     'summary': 'GOLEM Activity Registration Custom Price',
     'description': '''GOLEM Activity Registration Custom Price :
     - allow set of 1:n slices based on family quotient ;
-    - allow set 1:n area data ;
+    - allow set 1:n root area data ;
     - allow set price per area and slice ;
     - computes automatically applicable price ;
     - anticipate ruleset to be implemented for computing.''',
-    'version': '10.0.0.1.2',
+    'version': '10.0.0.2.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
diff --git a/golem_activity_registration_custom_price/models/golem_activity.py b/golem_activity_registration_custom_price/models/golem_activity.py
index 4f08f40..5d451b5 100644
--- a/golem_activity_registration_custom_price/models/golem_activity.py
+++ b/golem_activity_registration_custom_price/models/golem_activity.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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
diff --git a/golem_activity_registration_custom_price/models/golem_member.py b/golem_activity_registration_custom_price/models/golem_member.py
index ebac655..e131fd2 100644
--- a/golem_activity_registration_custom_price/models/golem_member.py
+++ b/golem_activity_registration_custom_price/models/golem_member.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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
diff --git a/golem_member/__manifest__.py b/golem_member/__manifest__.py
index 0707864..e63d0f3 100644
--- a/golem_member/__manifest__.py
+++ b/golem_member/__manifest__.py
@@ -20,7 +20,7 @@
     'name': 'GOLEM non-profit members',
     'summary': 'Extends Odoo contacts for MJC',
     'description': 'Extends Odoo contacts for MJC',
-    'version': '10.0.2.3.5',
+    'version': '10.0.2.4.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',
diff --git a/golem_member/i18n/fr.po b/golem_member/i18n/fr.po
index 1d6a043..77e1429 100644
--- a/golem_member/i18n/fr.po
+++ b/golem_member/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-27 09:04+0000\n"
-"PO-Revision-Date: 2018-08-27 11:21+0200\n"
+"POT-Creation-Date: 2018-10-22 16:02+0000\n"
+"PO-Revision-Date: 2018-10-22 18:09+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -72,6 +72,18 @@ msgstr "Appliquer pour les nouveaux adhérents"
 msgid "Area"
 msgstr "Territoire"
 
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_member_area_from_street
+#: model:ir.model.fields,field_description:golem_member.field_res_partner_area_from_street
+#: model:ir.model.fields,field_description:golem_member.field_res_users_area_from_street
+msgid "Area from street"
+msgstr "Territoire automatique depuis la rue"
+
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_area_id
+msgid "Area id"
+msgstr "Territoire"
+
 #. module: golem_member
 #: model:ir.ui.view,arch_db:golem_member.golem_member_form
 #: model:ir.ui.view,arch_db:golem_member.res_partner_form_inherit_golem_member
@@ -295,6 +307,7 @@ msgstr "Faire de ce contact un usager"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_create_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_create_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_create_uid
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_create_uid
 msgid "Created by"
 msgstr "Créé par"
 
@@ -303,6 +316,7 @@ msgstr "Créé par"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_create_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_create_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_create_date
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_create_date
 msgid "Created on"
 msgstr "Créé le"
 
@@ -381,6 +395,7 @@ msgstr "Département"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_display_name
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_display_name
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_display_name
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
@@ -415,7 +430,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:57
+#: code:addons/golem_member/models/golem_member.py:103
 #, python-format
 msgid "Female"
 msgstr "Féminin"
@@ -487,11 +502,16 @@ msgid "GOLEM Members Tags"
 msgstr "Catégories d'adhérents"
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:360
+#: code:addons/golem_member/models/golem_member.py:433
 #, python-format
 msgid "GOLEM Members merge has not been implemented yet. Please only merge partners, not members, or delete GOLEM Members manually before merging."
 msgstr "La fusion d'adhérents n'a pas encore été implémentée. Merci de ne fusionner que des contacts non adhérents, ou bien de supprimer les adhérents manuellement en premier lieu."
 
+#. module: golem_member
+#: model:ir.model,name:golem_member.model_golem_partner_area_street
+msgid "GOLEM Partner Area Street"
+msgstr "GOLEM Partner Area Street"
+
 #. module: golem_member
 #: model:ir.model,name:golem_member.model_golem_season
 msgid "GOLEM Season"
@@ -537,6 +557,7 @@ msgstr "A des écritures non lettrées"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_id
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_id
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_id
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_id
 msgid "ID"
 msgstr "ID"
 
@@ -677,6 +698,7 @@ msgstr "Langue"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number___last_update
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig___last_update
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area___last_update
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street___last_update
 msgid "Last Modified on"
 msgstr "Dernière Modification le"
 
@@ -684,6 +706,7 @@ msgstr "Dernière Modification le"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_write_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_write_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_write_uid
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_write_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
@@ -692,6 +715,7 @@ msgstr "Dernière mise à jour par"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_write_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_write_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_write_date
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_write_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
@@ -712,7 +736,7 @@ msgid "Latest Invoices & Payments Matching Date"
 msgstr "Date de dernière correspondance des factures et paiements"
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:57
+#: code:addons/golem_member/models/golem_member.py:103
 #, python-format
 msgid "Male"
 msgstr "Masculin"
@@ -740,7 +764,7 @@ msgstr "Image de taille moyenne de ce contact. Elle est automatiquement redimens
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_member_id
 msgid "Member"
-msgstr "Adhérent"
+msgstr "Usager"
 
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name
@@ -804,8 +828,9 @@ msgstr "NIC"
 
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_name
-#: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name_4301
+#: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name_4230
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_name
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_name
 msgid "Name"
 msgstr "Nom"
 
@@ -817,8 +842,8 @@ msgid "Nationality"
 msgstr "Nationalité"
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:300
-#: code:addons/golem_member/models/golem_member.py:303
+#: code:addons/golem_member/models/golem_member.py:373
+#: code:addons/golem_member/models/golem_member.py:376
 #: selection:golem.member.numberconfig,is_automatic:0
 #: selection:golem.member.numberconfig,is_per_season:0
 #, python-format
@@ -865,6 +890,16 @@ msgstr "Refuse les SMS ?"
 msgid "Out of mailings?"
 msgstr "Refuse la réception de mails ?"
 
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_partner_area_view_search
+msgid "Parent"
+msgstr "Parent"
+
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_parent_id
+msgid "Parent Territory"
+msgstr "Territoire parent"
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_parent_name
 msgid "Parent name"
@@ -949,6 +984,16 @@ msgstr "Date d'inscription"
 msgid "Related Company"
 msgstr "Société liée"
 
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_partner_area_view_search
+msgid "Root Territories"
+msgstr "Territoires racines"
+
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_root_id
+msgid "Root area"
+msgstr "Territoire racine"
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_siren
 msgid "SIREN"
@@ -1084,6 +1129,11 @@ msgstr "État"
 msgid "Street"
 msgstr "Rue"
 
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_area_street_ids
+msgid "Street list"
+msgstr "Liste de rues"
+
 #. module: golem_member
 #: model:ir.ui.view,arch_db:golem_member.golem_member_form
 msgid "Street..."
@@ -1092,7 +1142,12 @@ msgstr "Rue..."
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_street2
 msgid "Street2"
-msgstr "Complément de rue"
+msgstr "Rue 2"
+
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_partner_area_view_search
+msgid "Sub Territories"
+msgstr "Sous-territoires"
 
 #. module: golem_member
 #: model:ir.actions.act_window,name:golem_member.golem_member_action
@@ -1150,6 +1205,12 @@ msgstr "L'utilisateur interne qui est en charge de la communication avec ce cont
 msgid "The name of official registry where this company was declared."
 msgstr "Nom de la ville du tribunal de commerce dans laquelle la société est enregistrée."
 
+#. module: golem_member
+#: code:addons/golem_member/models/golem_member.py:69
+#, python-format
+msgid "The parent area is a sub area of the current area, please change it."
+msgstr "Le territoire parent est un sous-territoire du territoire courant, merci de modifier vos saisies."
+
 #. module: golem_member
 #: model:ir.model.fields,help:golem_member.field_golem_member_has_unreconciled_entries
 msgid "The partner has at least one unreconciled debit and credit since last time the invoices & payments matching was performed."
@@ -1186,14 +1247,14 @@ msgid "This field holds the image used as avatar for this contact, limited to 10
 msgstr "Ce champ contient l'image utilisée comme photo d'identité pour ce contact, limitée à 1024x1024px."
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:108
+#: code:addons/golem_member/models/golem_member.py:168
 #: sql_constraint:golem.member:0
 #, python-format
 msgid "This member number has already been used."
 msgstr "Ce numéro d'adhérent a été déjà utilisé."
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:33
+#: code:addons/golem_member/models/golem_member.py:47
 #: sql_constraint:golem.partner.area:0
 #, python-format
 msgid "This patner area has already been used."
@@ -1260,7 +1321,7 @@ msgid "Total amount you have to pay to this vendor."
 msgstr "Montant total à payer au fournisseur."
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:175
+#: code:addons/golem_member/models/golem_member.py:235
 #, python-format
 msgid "Unsupported operator for defautl season search"
 msgstr "Opérateur de recherche non supporté pour le filtre de saison par défaut"
@@ -1296,8 +1357,8 @@ msgid "Website of Partner or Company"
 msgstr "Site Web pour les Partenaires ou les Sociétés"
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:300
-#: code:addons/golem_member/models/golem_member.py:303
+#: code:addons/golem_member/models/golem_member.py:373
+#: code:addons/golem_member/models/golem_member.py:376
 #: selection:golem.member.numberconfig,is_automatic:0
 #: selection:golem.member.numberconfig,is_per_season:0
 #, python-format
diff --git a/golem_member/i18n/golem_member.pot b/golem_member/i18n/golem_member.pot
index 9473e87..f53956e 100644
--- a/golem_member/i18n/golem_member.pot
+++ b/golem_member/i18n/golem_member.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-27 09:04+0000\n"
-"PO-Revision-Date: 2018-08-27 09:04+0000\n"
+"POT-Creation-Date: 2018-10-22 16:02+0000\n"
+"PO-Revision-Date: 2018-10-22 16:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -72,6 +72,18 @@ msgstr ""
 msgid "Area"
 msgstr ""
 
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_member_area_from_street
+#: model:ir.model.fields,field_description:golem_member.field_res_partner_area_from_street
+#: model:ir.model.fields,field_description:golem_member.field_res_users_area_from_street
+msgid "Area from street"
+msgstr ""
+
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_area_id
+msgid "Area id"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.ui.view,arch_db:golem_member.golem_member_form
 #: model:ir.ui.view,arch_db:golem_member.res_partner_form_inherit_golem_member
@@ -295,6 +307,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_create_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_create_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_create_uid
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_create_uid
 msgid "Created by"
 msgstr ""
 
@@ -303,6 +316,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_create_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_create_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_create_date
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_create_date
 msgid "Created on"
 msgstr ""
 
@@ -381,6 +395,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_display_name
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_display_name
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_display_name
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_display_name
 msgid "Display Name"
 msgstr ""
 
@@ -415,7 +430,7 @@ msgid "Fax"
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:57
+#: code:addons/golem_member/models/golem_member.py:103
 #, python-format
 msgid "Female"
 msgstr ""
@@ -487,11 +502,16 @@ msgid "GOLEM Members Tags"
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:360
+#: code:addons/golem_member/models/golem_member.py:433
 #, python-format
 msgid "GOLEM Members merge has not been implemented yet. Please only merge partners, not members, or delete GOLEM Members manually before merging."
 msgstr ""
 
+#. module: golem_member
+#: model:ir.model,name:golem_member.model_golem_partner_area_street
+msgid "GOLEM Partner Area Street"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.model,name:golem_member.model_golem_season
 msgid "GOLEM Season"
@@ -537,6 +557,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_id
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_id
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_id
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_id
 msgid "ID"
 msgstr ""
 
@@ -671,6 +692,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number___last_update
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig___last_update
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area___last_update
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street___last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -678,6 +700,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_write_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_write_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_write_uid
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_write_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_write_uid
 msgid "Last Updated by"
 msgstr ""
@@ -686,6 +709,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_write_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_write_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_write_date
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_write_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_write_date
 msgid "Last Updated on"
 msgstr ""
@@ -706,7 +730,7 @@ msgid "Latest Invoices & Payments Matching Date"
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:57
+#: code:addons/golem_member/models/golem_member.py:103
 #, python-format
 msgid "Male"
 msgstr ""
@@ -798,8 +822,9 @@ msgstr ""
 
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_name
-#: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name_4301
+#: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name_4230
 #: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_name
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_street_name
 msgid "Name"
 msgstr ""
 
@@ -811,8 +836,8 @@ msgid "Nationality"
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:300
-#: code:addons/golem_member/models/golem_member.py:303
+#: code:addons/golem_member/models/golem_member.py:373
+#: code:addons/golem_member/models/golem_member.py:376
 #: selection:golem.member.numberconfig,is_automatic:0
 #: selection:golem.member.numberconfig,is_per_season:0
 #, python-format
@@ -859,6 +884,16 @@ msgstr ""
 msgid "Out of mailings?"
 msgstr ""
 
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_partner_area_view_search
+msgid "Parent"
+msgstr ""
+
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_parent_id
+msgid "Parent Territory"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_parent_name
 msgid "Parent name"
@@ -941,6 +976,16 @@ msgstr ""
 msgid "Related Company"
 msgstr ""
 
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_partner_area_view_search
+msgid "Root Territories"
+msgstr ""
+
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_root_id
+msgid "Root area"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_siren
 msgid "SIREN"
@@ -1076,6 +1121,11 @@ msgstr ""
 msgid "Street"
 msgstr ""
 
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_area_street_ids
+msgid "Street list"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.ui.view,arch_db:golem_member.golem_member_form
 msgid "Street..."
@@ -1086,6 +1136,11 @@ msgstr ""
 msgid "Street2"
 msgstr ""
 
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_partner_area_view_search
+msgid "Sub Territories"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.actions.act_window,name:golem_member.golem_member_action
 #: model:ir.ui.menu,name:golem_member.golem_members_menu
@@ -1142,6 +1197,12 @@ msgstr ""
 msgid "The name of official registry where this company was declared."
 msgstr ""
 
+#. module: golem_member
+#: code:addons/golem_member/models/golem_member.py:69
+#, python-format
+msgid "The parent area is a sub area of the current area, please change it."
+msgstr ""
+
 #. module: golem_member
 #: model:ir.model.fields,help:golem_member.field_golem_member_has_unreconciled_entries
 msgid "The partner has at least one unreconciled debit and credit since last time the invoices & payments matching was performed."
@@ -1178,14 +1239,14 @@ msgid "This field holds the image used as avatar for this contact, limited to 10
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:108
+#: code:addons/golem_member/models/golem_member.py:168
 #: sql_constraint:golem.member:0
 #, python-format
 msgid "This member number has already been used."
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:33
+#: code:addons/golem_member/models/golem_member.py:47
 #: sql_constraint:golem.partner.area:0
 #, python-format
 msgid "This patner area has already been used."
@@ -1252,7 +1313,7 @@ msgid "Total amount you have to pay to this vendor."
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:175
+#: code:addons/golem_member/models/golem_member.py:235
 #, python-format
 msgid "Unsupported operator for defautl season search"
 msgstr ""
@@ -1288,8 +1349,8 @@ msgid "Website of Partner or Company"
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:300
-#: code:addons/golem_member/models/golem_member.py:303
+#: code:addons/golem_member/models/golem_member.py:373
+#: code:addons/golem_member/models/golem_member.py:376
 #: selection:golem.member.numberconfig,is_automatic:0
 #: selection:golem.member.numberconfig,is_per_season:0
 #, python-format
diff --git a/golem_member/models/__init__.py b/golem_member/models/__init__.py
index a3469d5..e52d006 100644
--- a/golem_member/models/__init__.py
+++ b/golem_member/models/__init__.py
@@ -15,4 +15,4 @@
 #    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, golem_season, golem_partner_area_street
+from . import golem_member, golem_season
diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py
index 0ef0885..970b4ff 100644
--- a/golem_member/models/golem_member.py
+++ b/golem_member/models/golem_member.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #    Copyright 2016-2018 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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
@@ -26,17 +27,15 @@ def get_root_area(area_id):
     """ Get root area """
     if not area_id.parent_id:
         return area_id
-    else:
-        return get_root_area(area_id.parent_id)
+    return get_root_area(area_id.parent_id)
 
 def is_sub_area(area_id, parent_id):
     """ Check if parent is sub area """
     if parent_id.parent_id.id == area_id.id:
         return True
-    elif not parent_id.parent_id:
+    if not parent_id.parent_id:
         return False
-    else:
-        return is_sub_area(area_id, parent_id.parent_id)
+    return is_sub_area(area_id, parent_id.parent_id)
 
 class PartnerArea(models.Model):
     """ Partner Area """
@@ -50,11 +49,11 @@ class PartnerArea(models.Model):
     name = fields.Char(required=True, index=True)
     sequence = fields.Integer()
     area_street_ids = fields.One2many('golem.partner.area.street', 'area_id',
-                                      string="street list")
-    parent_id = fields.Many2one('golem.partner.area', string="Parent Territory",
+                                      string='Street list')
+    parent_id = fields.Many2one('golem.partner.area', string='Parent Territory',
                                 domain="[('id', '!=', id)]")
-    root_id = fields.Many2one('golem.partner.area', compute="_compute_root_id",
-                              string="Root area")
+    root_id = fields.Many2one('golem.partner.area', compute='_compute_root_id',
+                              string='Root area')
 
     @api.depends('parent_id')
     def _compute_root_id(self):
@@ -67,9 +66,21 @@ class PartnerArea(models.Model):
         """ Check if parent is sub area """
         for area in self:
             if  is_sub_area(area, area.parent_id):
-                err = _("The parent area is a sub area of the current area, please change it")
+                err = _('The parent area is a sub area of the current area, '
+                        'please change it.')
                 raise ValidationError(err)
 
+
+class GolemPartnerAreaStreet(models.Model):
+    """ GOLEM Partner Area Street Management """
+    _name = 'golem.partner.area.street'
+    _description = 'GOLEM Partner Area Street'
+
+    name = fields.Char(required=True)
+    area_id = fields.Many2one('golem.partner.area', required=True, sring='Area',
+                              index=True, auto_join=True, ondelete='set null')
+
+
 class ResPartner(models.Model):
     """ GOLEM Member partner adaptations """
     _inherit = 'res.partner'
@@ -85,6 +96,7 @@ class ResPartner(models.Model):
         'golem.partner.area', index=True, auto_join=True, string='Area',
         help="Area, quarter... for statistics and activity price."
     )
+    area_from_street = fields.Boolean(store=False, default=False)
     country_id = fields.Many2one(default=_get_default_nationality_id)
 
     # Gender overwriting : no need for 'other' choice
@@ -117,17 +129,19 @@ class ResPartner(models.Model):
         gm_obj = self.env['golem.member']
         gm_obj.create({'partner_id': self[0].id})
 
-    @api.multi
     @api.constrains('street')
     def save_street(self):
         """ Save street if no exist """
         for member in self:
-            if member.street:
-                street = self.env['golem.partner.area.street'].search([
-                    ('name', 'ilike', member.street)])
-                if not street:
-                    self.env['golem.partner.area.street'].create({'name': member.street,
-                                                                  'area_id': member.area_id.id})
+            if member.street and not member.area_from_street:
+                mstreet = member.street.strip()
+                street_id = self.env['golem.partner.area.street'].search(
+                    [('name', 'ilike', mstreet)]
+                )
+                if not street_id:
+                    self.env['golem.partner.area.street'].create(
+                        {'name': mstreet, 'area_id': member.area_id.id}
+                    )
 
 class GolemMembershipInvoice(models.TransientModel):
     """ GOLEM Membership Invoice adaptations """
@@ -228,6 +242,19 @@ class GolemMember(models.Model):
         is_num_man = (conf.get_param('golem_numberconfig_isautomatic') == '0')
         self.update({'is_number_manual': is_num_man})
 
+    @api.onchange('street')
+    def onchange_street(self):
+        """ Area auto assignement """
+        for member in self:
+            mstreet = member.street.strip() if member.street else False
+            if mstreet and not member.area_id:
+                street_id = self.env['golem.partner.area.street'].search(
+                    [('name', 'ilike', mstreet)], limit=1
+                )
+                if street_id:
+                    member.area_id = street_id.area_id
+                    member.area_from_street = True
+
     @api.multi
     def generate_number_perseason(self):
         """ Number generation in case of per season configuration """
@@ -296,21 +323,13 @@ class GolemMember(models.Model):
                     member.number = member.generate_number_global()
 
     @api.multi
-    def write(self, values):
+    def write(self, vals):
         """ Number generation after updates """
-        res = super(GolemMember, self).write(values)
-        if 'season_ids' in values or 'number_manual' in values:
+        res = super(GolemMember, self).write(vals)
+        if 'season_ids' in vals or 'number_manual' in vals:
             self.generate_number()
         return res
 
-    @api.onchange('street')
-    def onchange_street(self):
-        """ Area auto assignement """
-        self.ensure_one()
-        member = self[0]
-        street = self.env['golem.partner.area.street'].search([('name', 'ilike', member.street)])
-        if street:
-            member.area_id = street[0].area_id
 
 class GolemMemberNumber(models.Model):
     """ GOLEM Member Numbers """
diff --git a/golem_member/models/golem_partner_area_street.py b/golem_member/models/golem_partner_area_street.py
deleted file mode 100644
index af51e78..0000000
--- a/golem_member/models/golem_partner_area_street.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
-#    Copyright 2018 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/>.
-
-""" GOLEM Partner Area Street Management """
-
-from odoo import models, fields, api
-
-
-class GolemPartnerAreaStreet(models.Model):
-    """ GOLEM Partner Area Street Management """
-    _name = 'golem.partner.area.street'
-    _description = 'GOLEM Partner Area Street'
-
-    name = fields.Char(required=True)
-    area_id = fields.Many2one('golem.partner.area', required=True,
-                              index=True, auto_join=True, ondelete="set null")
diff --git a/golem_member/security/ir.model.access.csv b/golem_member/security/ir.model.access.csv
index cf58e5c..4678aeb 100644
--- a/golem_member/security/ir.model.access.csv
+++ b/golem_member/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_golem_member_user,Access GOLEM Member User,model_golem_member,golem_base.group_golem_user,1,1,1,1
 access_partner_area_user,Access GOLEM Partner Area User,model_golem_partner_area,golem_base.group_golem_user,1,1,1,1
+access_partner_area_street_user,Access GOLEM Partner Area Street User,model_golem_partner_area_street,golem_base.group_golem_user,1,1,1,1
 access_golem_member_season_user,Access GOLEM Member Season User,model_golem_member_number,golem_base.group_golem_user,1,1,1,1
 access_ir_config_parameter_manager,Access IR Config Parameter Manager,base.model_ir_config_parameter,golem_base.group_golem_manager,1,1,1,1
diff --git a/golem_member/views/golem_partner_area_views.xml b/golem_member/views/golem_partner_area_views.xml
index 2a70c61..34d897d 100644
--- a/golem_member/views/golem_partner_area_views.xml
+++ b/golem_member/views/golem_partner_area_views.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Youssef El Ouahby <youssef@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
@@ -39,14 +40,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="arch" type="xml">
         <form>
           <group>
-              <field name="name"/>
-              <field name="parent_id"/>
-              <field name="root_id"/>
-              <field name="area_street_ids">
-                <tree editable="bottom">
-                  <field name="name"/>
-                </tree>
-              </field>
+            <group>
+            <field name="name" />
+            </group>
+            <group>
+              <field name="parent_id" />
+              <field name="root_id" />
+            </group>
+          </group>
+          <group>
+            <field name="area_street_ids">
+              <tree editable="bottom">
+                <field name="name" />
+              </tree>
+            </field>
           </group>
         </form>
       </field>
@@ -58,20 +65,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="model">golem.partner.area</field>
       <field name="arch" type="xml">
         <search>
-          <field name="name"/>
-          <field name="parent_id"/>
+          <field name="name" />
+          <field name="parent_id" />
           <filter name="sub_territories" string="Sub Territories"
-            domain="[('parent_id', '!=', False)]"/>
-          <filter name="parent_territories" string="Parent Territories"
-            domain="[('parent_id', '=', False)]"/>
+            domain="[('parent_id', '!=', False)]" />
+          <filter name="root_territories" string="Root Territories"
+            domain="[('parent_id', '=', False)]" />
+          <filter name="group_parent" string="Parent"
+            context="{'group_by': 'parent_id'}" />
         </search>
       </field>
     </record>
 
     <!-- Actions -->
-    <act_window id="golem_partner_area_action"
-      name="Areas" res_model="golem.partner.area"
-      view_mode="tree,form" />
+    <act_window id="golem_partner_area_action" name="Areas"
+      res_model="golem.partner.area" view_mode="tree,form" />
 
     <!-- Menus -->
     <menuitem id="golem_partner_area_menu" name="Areas"

From 7b9cbb41457a2d39a066b8e6e07163d5c6e6f68f Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Tue, 23 Oct 2018 18:22:04 +0200
Subject: [PATCH 46/52] [FIX]GOLEM Activity Registration Payment : unique
 invoice this season

And not default season only
---
 golem_activity_registration_payment/__manifest__.py          | 2 +-
 .../wizard/golem_activity_registration_invoicing.py          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/golem_activity_registration_payment/__manifest__.py b/golem_activity_registration_payment/__manifest__.py
index 2363982..cfb8e4a 100644
--- a/golem_activity_registration_payment/__manifest__.py
+++ b/golem_activity_registration_payment/__manifest__.py
@@ -20,7 +20,7 @@
     'name': 'GOLEM Activity Member Registration Payments',
     'summary': 'GOLEM Activities Member Registration Payments',
     'description': 'GOLEM Activities Member Registration Payments',
-    'version': '10.0.0.4.1',
+    'version': '10.0.0.5.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
diff --git a/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py b/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py
index 5145c6c..96fd434 100644
--- a/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py
+++ b/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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
@@ -86,8 +87,8 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
         partner = self.member_id.partner_id
         #check if there is a draft invoice for the current customer
         member_line = partner.member_lines.filtered(
-            lambda ml: (ml.membership_id.membership_season_id.is_default and
-                        ml.account_invoice_id.state == 'draft')
+            lambda ml: (ml.membership_id.membership_season_id == self.season_id
+                        and ml.account_invoice_id.state == 'draft')
             )
         if member_line:
             invoice = member_line[0].account_invoice_id

From 9fec3aeaeffad54326694944d0d14fa5c93ca728 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Tue, 23 Oct 2018 18:23:07 +0200
Subject: [PATCH 47/52] [FIX]GOLEM Family Membership : do not required family
 fields

Because we extend default invoicing transience model, we will need these
fields for all memberships...
---
 golem_family_membership/__manifest__.py                      | 2 +-
 golem_family_membership/wizard/golem_membership_invoice.py   | 5 ++---
 .../wizard/golem_membership_invoice_views.xml                | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/golem_family_membership/__manifest__.py b/golem_family_membership/__manifest__.py
index 50ba7d7..9c866fd 100644
--- a/golem_family_membership/__manifest__.py
+++ b/golem_family_membership/__manifest__.py
@@ -20,7 +20,7 @@
     'name': 'GOLEM Family Memberships',
     'summary': 'GOLEM Family Membership Management',
     'description': 'GOLEM Family Membership Management',
-    'version': '10.0.0.1.0',
+    'version': '10.0.0.1.1',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Youssef ELOUAHBY',
     'license': 'AGPL-3',
diff --git a/golem_family_membership/wizard/golem_membership_invoice.py b/golem_family_membership/wizard/golem_membership_invoice.py
index 6db2ac2..debd2b5 100644
--- a/golem_family_membership/wizard/golem_membership_invoice.py
+++ b/golem_family_membership/wizard/golem_membership_invoice.py
@@ -25,10 +25,9 @@ class GolemMembershipInvoice(models.TransientModel):
     _inherit = 'golem.membership.invoice'
 
     family_id = fields.Many2one('golem.family', string='Family',
-                                required=True, ondelete='cascade')
+                                ondelete='cascade')
     member_ids = fields.Many2many('res.partner', string='Concerned members')
-    on_the_name_of = fields.Many2one('res.partner', ondelete='cascade',
-                                     required=True)
+    on_the_name_of = fields.Many2one('res.partner', ondelete='cascade')
 
     @api.onchange('family_id')
     def onchange_family(self):
diff --git a/golem_family_membership/wizard/golem_membership_invoice_views.xml b/golem_family_membership/wizard/golem_membership_invoice_views.xml
index 78bf637..0876d88 100644
--- a/golem_family_membership/wizard/golem_membership_invoice_views.xml
+++ b/golem_family_membership/wizard/golem_membership_invoice_views.xml
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <field name="member_ids" widget="many2many_tags"
               options="{'no_create': True}" />
             <field name="on_the_name_of" options="{'no_create': True}"
-              attrs="{'readonly': [('member_ids', '=', [])]}" />
+              attrs="{'readonly': [('member_ids', '=', [])], 'required': [('family_id', '!=', False)]}" />
             <field name="product_id" domain="[('family_membership','=',True)]"
               widget="selection" />
             <field name="member_price" />

From aa9eb113f1cef4b781bd4f2dafa87881a4070a07 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Wed, 24 Oct 2018 07:54:52 +0200
Subject: [PATCH 48/52] [REM][TMP]GOLEM Family Minor : do not overwrite domain

This addon will be removed
---
 golem_family_minor/__init__.py     |  2 --
 golem_family_minor/__manifest__.py |  4 ++--
 golem_family_minor/golem_member.py | 29 -----------------------------
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 golem_family_minor/golem_member.py

diff --git a/golem_family_minor/__init__.py b/golem_family_minor/__init__.py
index 8d28962..643d893 100644
--- a/golem_family_minor/__init__.py
+++ b/golem_family_minor/__init__.py
@@ -14,5 +14,3 @@
 #
 #    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_family_minor/__manifest__.py b/golem_family_minor/__manifest__.py
index da1ab91..44b581c 100644
--- a/golem_family_minor/__manifest__.py
+++ b/golem_family_minor/__manifest__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2016-2018 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
@@ -18,7 +18,7 @@
 {
     'name': 'GOLEM members minor and family',
     'summary': 'GOLEM non-profit members family + minor management',
-    'version': '10.0.1.0.0',
+    'version': '10.0.1.1.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
diff --git a/golem_family_minor/golem_member.py b/golem_family_minor/golem_member.py
deleted file mode 100644
index 96ee293..0000000
--- a/golem_family_minor/golem_member.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: 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/>.
-
-""" GOLEM Family Minor glue module"""
-
-from odoo import models, fields
-
-LEGAL_DMN = "['&', ('family_id', '=', family_id), ('id', '!=', partner_id)]"
-
-
-class GolemMember(models.Model):
-    """ Member adaptations """
-    _inherit = 'golem.member'
-
-    legal_guardian_ids = fields.Many2many(domain=LEGAL_DMN)

From da07c202f3d7b43b8c56c2a9d31a2abf177fae97 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Wed, 24 Oct 2018 07:57:15 +0200
Subject: [PATCH 49/52] [REF][FIX]GOLEM Member Minor : new legal guardians

* Remove button to do default (and so browser reload) in favor of parent
constraint ;
* Ensures there is no double (two times same person) with SQL
constraint.
---
 golem_member_minor/__manifest__.py            |  5 +-
 .../migrations/10.0.1.1.3/post-migrate.py     |  2 +
 golem_member_minor/models/__init__.py         |  1 +
 .../models/golem_legal_guardian.py            | 70 ++++++-------------
 golem_member_minor/models/golem_member.py     | 16 ++++-
 .../security/ir.model.access.csv              |  2 +
 .../views/golem_member_views.xml              | 49 +++++++------
 7 files changed, 72 insertions(+), 73 deletions(-)
 create mode 100644 golem_member_minor/security/ir.model.access.csv

diff --git a/golem_member_minor/__manifest__.py b/golem_member_minor/__manifest__.py
index 419c330..202ed3b 100644
--- a/golem_member_minor/__manifest__.py
+++ b/golem_member_minor/__manifest__.py
@@ -18,12 +18,13 @@
 {
     'name': 'GOLEM members minor',
     'summary': 'GOLEM non-profit members minor management',
-    'version': '10.0.1.1.3',
+    'version': '10.0.1.2.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
     'application': False,
     'installable': True,
     'depends': ['golem_member'],
-    'data': ['views/golem_member_views.xml']
+    'data': ['security/ir.model.access.csv',
+             'views/golem_member_views.xml']
 }
diff --git a/golem_member_minor/migrations/10.0.1.1.3/post-migrate.py b/golem_member_minor/migrations/10.0.1.1.3/post-migrate.py
index 124d0c8..7b96e02 100644
--- a/golem_member_minor/migrations/10.0.1.1.3/post-migrate.py
+++ b/golem_member_minor/migrations/10.0.1.1.3/post-migrate.py
@@ -27,3 +27,5 @@ def migrate(cursor, version):
         cursor.execute('''INSERT INTO golem_legal_guardian(member_id, legal_guardian_id) VALUES
                            (%s, %s)''' % (member_id, legal_guardian_id))
     cursor.execute('DROP TABLE golem_member_res_partner_rel')
+    cursor.execute('DELETE FROM ir_model_fields WHERE name=\'legal_guardian_ids\' '
+                   'AND ttype=\'many2many\'')
diff --git a/golem_member_minor/models/__init__.py b/golem_member_minor/models/__init__.py
index 6bf7b26..d92c984 100644
--- a/golem_member_minor/models/__init__.py
+++ b/golem_member_minor/models/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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
diff --git a/golem_member_minor/models/golem_legal_guardian.py b/golem_member_minor/models/golem_legal_guardian.py
index b19065b..2e5e1df 100644
--- a/golem_member_minor/models/golem_legal_guardian.py
+++ b/golem_member_minor/models/golem_legal_guardian.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
+#    Copyright 2018 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
@@ -15,58 +16,29 @@
 #    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/>.
 
-""" Golem Legal Guardian Management """
+""" GOLEM Legal Guardian Management """
 
-from odoo import models, fields, api, _
-from odoo.exceptions import ValidationError
+from odoo import models, fields, _
 
 class GolemLegalGuardian(models.Model):
-    """ Golem Legal Guardian Management """
+    """ GOLEM Legal Guardian Management """
     _name = 'golem.legal.guardian'
+    _description = 'GOLEM Legal Guardian Management'
+    _sql_constraints = [(
+        'golem_legal_guardian_uniq', 'UNIQUE (member_id, legal_guardian_id)',
+        _('There are doubles in your legal guardians. Please check your fills.')
+    )]
 
     member_id = fields.Many2one('golem.member', required=True,
-                                ondelete='cascade',
-                                readonly=True)
-    legal_guardian_id = fields.Many2one('res.partner', required=True,
-                                        domain="[('is_company', '=', False)]",
-                                        ondelete='cascade')
-    name = fields.Char(related="legal_guardian_id.name")
-    contact_address = fields.Char(related="legal_guardian_id.contact_address")
-    phone = fields.Char(related="legal_guardian_id.phone")
-    mobile = fields.Char(related="legal_guardian_id.mobile")
-    email = fields.Char(related="legal_guardian_id.email")
-
-
+                                index=True, auto_join=True,
+                                ondelete='cascade')
+    legal_guardian_id = fields.Many2one(
+        'res.partner', required=True, index=True, auto_join=True,
+        string='Legal guardian', ondelete='cascade',
+        domain="[('is_company', '=', False)]"
+    )
+    contact_address = fields.Char(related='legal_guardian_id.contact_address')
+    phone = fields.Char(related='legal_guardian_id.phone')
+    mobile = fields.Char(related='legal_guardian_id.mobile')
+    email = fields.Char(related='legal_guardian_id.email')
     is_default_guardian = fields.Boolean()
-
-    def do_default_guardian(self):
-        """ Make current only default guardian """
-        self.ensure_one()
-        self.write({'is_default_guardian': True})
-        legal_list = self.member_id.legal_guardian_ids.filtered(
-            lambda a: a.legal_guardian_id not in self.legal_guardian_id)
-        legal_list.write({'is_default_guardian': False})
-        return {
-            'type': 'ir.actions.client',
-            'tag': 'reload'
-            }
-
-    @api.model
-    def create(self, values):
-        """ Make the current guardian is default if the only, and the only if default """
-        if values['is_default_guardian']:
-            self.env['golem.member'].browse(values['member_id']).legal_guardian_ids.write(
-                {'is_default_guardian': False})
-        if not self.env['golem.member'].browse(values['member_id']).legal_guardian_ids:
-            values['is_default_guardian'] = True
-        return  super(GolemLegalGuardian, self).create(values)
-
-    @api.multi
-    def unlink(self):
-        """ Forbids default legal guardian removal """
-        for guardian in self:
-            if guardian.is_default_guardian and len(guardian.member_id.legal_guardian_ids) > 1:
-                emsg = _('You can\'t delete the default legal guardian')
-                raise ValidationError(emsg)
-            else:
-                return super(GolemLegalGuardian, self).unlink()
diff --git a/golem_member_minor/models/golem_member.py b/golem_member_minor/models/golem_member.py
index b0ef6fd..2829e05 100644
--- a/golem_member_minor/models/golem_member.py
+++ b/golem_member_minor/models/golem_member.py
@@ -18,7 +18,8 @@
 """ GOLEM Member Minor management """
 
 from datetime import date, timedelta
-from odoo import models, fields, api
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
 
 ADULT_DURATION = timedelta(days=365.25*18)
 
@@ -51,3 +52,16 @@ class GolemMember(models.Model):
         else:
             operator = '<=' if value else '>'
         return [('birthdate_date', operator, adult_date)]
+
+    @api.constrains('legal_guardian_ids')
+    def check_default_guardian(self):
+        """ Ensures there is one and only one default guardian, no double """
+        for member in self:
+            if len(member.legal_guardian_ids):
+                default_guardians_count = len(member.legal_guardian_ids.filtered(
+                    'is_default_guardian'
+                ))
+                if not default_guardians_count or default_guardians_count > 1:
+                    verr = _('You must have one and only one default legal '
+                             'guardian. Please check your fills.')
+                    raise ValidationError(verr)
diff --git a/golem_member_minor/security/ir.model.access.csv b/golem_member_minor/security/ir.model.access.csv
new file mode 100644
index 0000000..3e6751c
--- /dev/null
+++ b/golem_member_minor/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_golem_legal_guardian_user,Access GOLEM Legal Guardian User,model_golem_legal_guardian,golem_base.group_golem_user,1,1,1,1
diff --git a/golem_member_minor/views/golem_member_views.xml b/golem_member_minor/views/golem_member_views.xml
index bea5849..966b050 100644
--- a/golem_member_minor/views/golem_member_views.xml
+++ b/golem_member_minor/views/golem_member_views.xml
@@ -2,6 +2,7 @@
 
 <!--
 Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Youssef El Ouahby <youssef@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
@@ -20,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <odoo>
   <data>
 
-    <!-- Form -->
+    <!-- Forms -->
     <record model="ir.ui.view" id="golem_member_form_inherit_minor">
       <field name="name">Add Minor Page/Tab</field>
       <field name="model">golem.member</field>
@@ -34,39 +35,45 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               <field name="leave_alone"/>
               <field name="partner_id" invisible="True" required="False" />
               <field name="is_minor" invisible="True" />
-              <field name="legal_guardian_ids" context="{'default_member_id': active_id}">
-                <tree>
-                  <field name="name"/>
-                  <field name="contact_address" />
-                  <field name="phone" />
-                  <field name="mobile" />
-                  <field name="email" widget="email" />
-                  <field name="is_default_guardian"/>
-                  <button name="do_default_guardian" type="object"
-                    icon="fa-bookmark"
-                    attrs="{'invisible': [('is_default_guardian', '=', True)]}"/>
-                </tree>
-              </field>
+              <field name="legal_guardian_ids" context="{'default_member_id': active_id}" />
             </group>
           </page>
         </page>
       </field>
     </record>
-    <!-- Forms -->
-    <record id="golem_legal_guardian_form" model="ir.ui.view">
+
+    <record id="golem_legal_guardian_view_form" model="ir.ui.view">
       <field name="name">GOLEM Legal Guardian Form</field>
       <field name="model">golem.legal.guardian</field>
       <field name="arch" type="xml">
         <form>
-          <group>
-            <field name="member_id" invisible="1"/>
-            <field name="legal_guardian_id"/>
-            <field name="is_default_guardian"/>
-          </group>
+          <sheet>
+            <group>
+              <field name="member_id" />
+              <field name="legal_guardian_id" />
+              <field name="is_default_guardian" />
+            </group>
+          </sheet>
         </form>
       </field>
     </record>
 
+    <!-- Trees -->
+    <record id="golem_legal_guardian_view_tree" model="ir.ui.view">
+      <field name="name">GOLEM Legal Guardian Tree</field>
+      <field name="model">golem.legal.guardian</field>
+      <field name="arch" type="xml">
+        <tree editable="bottom">
+          <field name="legal_guardian_id" />
+          <field name="contact_address" />
+          <field name="phone" attrs="{'readonly': [('legal_guardian_id', '=', False)]}" />
+          <field name="mobile" attrs="{'readonly': [('legal_guardian_id', '=', False)]}" />
+          <field name="email" widget="email" attrs="{'readonly': [('legal_guardian_id', '=', False)]}" />
+          <field name="is_default_guardian" />
+        </tree>
+      </field>
+    </record>
+
     <!-- Search -->
     <record model="ir.ui.view" id="golem_member_search_inherit_minor">
       <field name="name">Add Minor/Adult filters</field>

From 0a035ce504e1efccf96ecb75c2fe8d66c79c5727 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Wed, 24 Oct 2018 07:57:15 +0200
Subject: [PATCH 50/52] [REF][FIX]GOLEM Member Minor : new legal guardians

* Remove button to do default (and so browser reload) in favor of parent
constraint ;
* Ensures there is no double (two times same person) with SQL
constraint ;
* Add SQL on migration script to handle old column name inherited from
m2m ;
* Add base security on new model ;
---
 golem_member_minor/__manifest__.py            |  5 +-
 .../migrations/10.0.1.1.3/post-migrate.py     |  2 +
 golem_member_minor/models/__init__.py         |  1 +
 .../models/golem_legal_guardian.py            | 70 ++++++-------------
 golem_member_minor/models/golem_member.py     | 16 ++++-
 .../security/ir.model.access.csv              |  2 +
 .../views/golem_member_views.xml              | 49 +++++++------
 7 files changed, 72 insertions(+), 73 deletions(-)
 create mode 100644 golem_member_minor/security/ir.model.access.csv

diff --git a/golem_member_minor/__manifest__.py b/golem_member_minor/__manifest__.py
index 419c330..202ed3b 100644
--- a/golem_member_minor/__manifest__.py
+++ b/golem_member_minor/__manifest__.py
@@ -18,12 +18,13 @@
 {
     'name': 'GOLEM members minor',
     'summary': 'GOLEM non-profit members minor management',
-    'version': '10.0.1.1.3',
+    'version': '10.0.1.2.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
     'application': False,
     'installable': True,
     'depends': ['golem_member'],
-    'data': ['views/golem_member_views.xml']
+    'data': ['security/ir.model.access.csv',
+             'views/golem_member_views.xml']
 }
diff --git a/golem_member_minor/migrations/10.0.1.1.3/post-migrate.py b/golem_member_minor/migrations/10.0.1.1.3/post-migrate.py
index 124d0c8..7b96e02 100644
--- a/golem_member_minor/migrations/10.0.1.1.3/post-migrate.py
+++ b/golem_member_minor/migrations/10.0.1.1.3/post-migrate.py
@@ -27,3 +27,5 @@ def migrate(cursor, version):
         cursor.execute('''INSERT INTO golem_legal_guardian(member_id, legal_guardian_id) VALUES
                            (%s, %s)''' % (member_id, legal_guardian_id))
     cursor.execute('DROP TABLE golem_member_res_partner_rel')
+    cursor.execute('DELETE FROM ir_model_fields WHERE name=\'legal_guardian_ids\' '
+                   'AND ttype=\'many2many\'')
diff --git a/golem_member_minor/models/__init__.py b/golem_member_minor/models/__init__.py
index 6bf7b26..d92c984 100644
--- a/golem_member_minor/models/__init__.py
+++ b/golem_member_minor/models/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@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
diff --git a/golem_member_minor/models/golem_legal_guardian.py b/golem_member_minor/models/golem_legal_guardian.py
index b19065b..2e5e1df 100644
--- a/golem_member_minor/models/golem_legal_guardian.py
+++ b/golem_member_minor/models/golem_legal_guardian.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
+#    Copyright 2018 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
@@ -15,58 +16,29 @@
 #    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/>.
 
-""" Golem Legal Guardian Management """
+""" GOLEM Legal Guardian Management """
 
-from odoo import models, fields, api, _
-from odoo.exceptions import ValidationError
+from odoo import models, fields, _
 
 class GolemLegalGuardian(models.Model):
-    """ Golem Legal Guardian Management """
+    """ GOLEM Legal Guardian Management """
     _name = 'golem.legal.guardian'
+    _description = 'GOLEM Legal Guardian Management'
+    _sql_constraints = [(
+        'golem_legal_guardian_uniq', 'UNIQUE (member_id, legal_guardian_id)',
+        _('There are doubles in your legal guardians. Please check your fills.')
+    )]
 
     member_id = fields.Many2one('golem.member', required=True,
-                                ondelete='cascade',
-                                readonly=True)
-    legal_guardian_id = fields.Many2one('res.partner', required=True,
-                                        domain="[('is_company', '=', False)]",
-                                        ondelete='cascade')
-    name = fields.Char(related="legal_guardian_id.name")
-    contact_address = fields.Char(related="legal_guardian_id.contact_address")
-    phone = fields.Char(related="legal_guardian_id.phone")
-    mobile = fields.Char(related="legal_guardian_id.mobile")
-    email = fields.Char(related="legal_guardian_id.email")
-
-
+                                index=True, auto_join=True,
+                                ondelete='cascade')
+    legal_guardian_id = fields.Many2one(
+        'res.partner', required=True, index=True, auto_join=True,
+        string='Legal guardian', ondelete='cascade',
+        domain="[('is_company', '=', False)]"
+    )
+    contact_address = fields.Char(related='legal_guardian_id.contact_address')
+    phone = fields.Char(related='legal_guardian_id.phone')
+    mobile = fields.Char(related='legal_guardian_id.mobile')
+    email = fields.Char(related='legal_guardian_id.email')
     is_default_guardian = fields.Boolean()
-
-    def do_default_guardian(self):
-        """ Make current only default guardian """
-        self.ensure_one()
-        self.write({'is_default_guardian': True})
-        legal_list = self.member_id.legal_guardian_ids.filtered(
-            lambda a: a.legal_guardian_id not in self.legal_guardian_id)
-        legal_list.write({'is_default_guardian': False})
-        return {
-            'type': 'ir.actions.client',
-            'tag': 'reload'
-            }
-
-    @api.model
-    def create(self, values):
-        """ Make the current guardian is default if the only, and the only if default """
-        if values['is_default_guardian']:
-            self.env['golem.member'].browse(values['member_id']).legal_guardian_ids.write(
-                {'is_default_guardian': False})
-        if not self.env['golem.member'].browse(values['member_id']).legal_guardian_ids:
-            values['is_default_guardian'] = True
-        return  super(GolemLegalGuardian, self).create(values)
-
-    @api.multi
-    def unlink(self):
-        """ Forbids default legal guardian removal """
-        for guardian in self:
-            if guardian.is_default_guardian and len(guardian.member_id.legal_guardian_ids) > 1:
-                emsg = _('You can\'t delete the default legal guardian')
-                raise ValidationError(emsg)
-            else:
-                return super(GolemLegalGuardian, self).unlink()
diff --git a/golem_member_minor/models/golem_member.py b/golem_member_minor/models/golem_member.py
index b0ef6fd..2829e05 100644
--- a/golem_member_minor/models/golem_member.py
+++ b/golem_member_minor/models/golem_member.py
@@ -18,7 +18,8 @@
 """ GOLEM Member Minor management """
 
 from datetime import date, timedelta
-from odoo import models, fields, api
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
 
 ADULT_DURATION = timedelta(days=365.25*18)
 
@@ -51,3 +52,16 @@ class GolemMember(models.Model):
         else:
             operator = '<=' if value else '>'
         return [('birthdate_date', operator, adult_date)]
+
+    @api.constrains('legal_guardian_ids')
+    def check_default_guardian(self):
+        """ Ensures there is one and only one default guardian, no double """
+        for member in self:
+            if len(member.legal_guardian_ids):
+                default_guardians_count = len(member.legal_guardian_ids.filtered(
+                    'is_default_guardian'
+                ))
+                if not default_guardians_count or default_guardians_count > 1:
+                    verr = _('You must have one and only one default legal '
+                             'guardian. Please check your fills.')
+                    raise ValidationError(verr)
diff --git a/golem_member_minor/security/ir.model.access.csv b/golem_member_minor/security/ir.model.access.csv
new file mode 100644
index 0000000..3e6751c
--- /dev/null
+++ b/golem_member_minor/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_golem_legal_guardian_user,Access GOLEM Legal Guardian User,model_golem_legal_guardian,golem_base.group_golem_user,1,1,1,1
diff --git a/golem_member_minor/views/golem_member_views.xml b/golem_member_minor/views/golem_member_views.xml
index bea5849..966b050 100644
--- a/golem_member_minor/views/golem_member_views.xml
+++ b/golem_member_minor/views/golem_member_views.xml
@@ -2,6 +2,7 @@
 
 <!--
 Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Youssef El Ouahby <youssef@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
@@ -20,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <odoo>
   <data>
 
-    <!-- Form -->
+    <!-- Forms -->
     <record model="ir.ui.view" id="golem_member_form_inherit_minor">
       <field name="name">Add Minor Page/Tab</field>
       <field name="model">golem.member</field>
@@ -34,39 +35,45 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               <field name="leave_alone"/>
               <field name="partner_id" invisible="True" required="False" />
               <field name="is_minor" invisible="True" />
-              <field name="legal_guardian_ids" context="{'default_member_id': active_id}">
-                <tree>
-                  <field name="name"/>
-                  <field name="contact_address" />
-                  <field name="phone" />
-                  <field name="mobile" />
-                  <field name="email" widget="email" />
-                  <field name="is_default_guardian"/>
-                  <button name="do_default_guardian" type="object"
-                    icon="fa-bookmark"
-                    attrs="{'invisible': [('is_default_guardian', '=', True)]}"/>
-                </tree>
-              </field>
+              <field name="legal_guardian_ids" context="{'default_member_id': active_id}" />
             </group>
           </page>
         </page>
       </field>
     </record>
-    <!-- Forms -->
-    <record id="golem_legal_guardian_form" model="ir.ui.view">
+
+    <record id="golem_legal_guardian_view_form" model="ir.ui.view">
       <field name="name">GOLEM Legal Guardian Form</field>
       <field name="model">golem.legal.guardian</field>
       <field name="arch" type="xml">
         <form>
-          <group>
-            <field name="member_id" invisible="1"/>
-            <field name="legal_guardian_id"/>
-            <field name="is_default_guardian"/>
-          </group>
+          <sheet>
+            <group>
+              <field name="member_id" />
+              <field name="legal_guardian_id" />
+              <field name="is_default_guardian" />
+            </group>
+          </sheet>
         </form>
       </field>
     </record>
 
+    <!-- Trees -->
+    <record id="golem_legal_guardian_view_tree" model="ir.ui.view">
+      <field name="name">GOLEM Legal Guardian Tree</field>
+      <field name="model">golem.legal.guardian</field>
+      <field name="arch" type="xml">
+        <tree editable="bottom">
+          <field name="legal_guardian_id" />
+          <field name="contact_address" />
+          <field name="phone" attrs="{'readonly': [('legal_guardian_id', '=', False)]}" />
+          <field name="mobile" attrs="{'readonly': [('legal_guardian_id', '=', False)]}" />
+          <field name="email" widget="email" attrs="{'readonly': [('legal_guardian_id', '=', False)]}" />
+          <field name="is_default_guardian" />
+        </tree>
+      </field>
+    </record>
+
     <!-- Search -->
     <record model="ir.ui.view" id="golem_member_search_inherit_minor">
       <field name="name">Add Minor/Adult filters</field>

From e146cab234e66cb247cb010be519cc146a785860 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Wed, 24 Oct 2018 08:01:54 +0200
Subject: [PATCH 51/52] [I18N]GOLEM Member Minor : updated translations

---
 golem_member_minor/i18n/fr.po                 | 92 ++++++++++++++++++-
 .../i18n/golem_member_minor.pot               | 92 ++++++++++++++++++-
 2 files changed, 180 insertions(+), 4 deletions(-)

diff --git a/golem_member_minor/i18n/fr.po b/golem_member_minor/i18n/fr.po
index 5834c19..f03e7dc 100644
--- a/golem_member_minor/i18n/fr.po
+++ b/golem_member_minor/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-26 16:15+0000\n"
-"PO-Revision-Date: 2018-08-26 18:15+0200\n"
+"POT-Creation-Date: 2018-10-24 05:59+0000\n"
+"PO-Revision-Date: 2018-10-24 08:01+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -25,16 +25,56 @@ msgstr "Participation aux activités?"
 msgid "Can leave alone?"
 msgstr "Peut quitter la structure seul?"
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_contact_address
+msgid "Complete Address"
+msgstr "Adresse complète"
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_create_uid
+msgid "Created by"
+msgstr "Créé par"
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_create_date
+msgid "Created on"
+msgstr "Créé le"
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_display_name
+msgid "Display Name"
+msgstr "Nom affiché"
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_email
+msgid "Email"
+msgstr "Courriel"
+
+#. module: golem_member_minor
+#: model:ir.model,name:golem_member_minor.model_golem_legal_guardian
+msgid "GOLEM Legal Guardian Management"
+msgstr "GOLEM Legal Guardian Management"
+
 #. module: golem_member_minor
 #: model:ir.model,name:golem_member_minor.model_golem_member
 msgid "GOLEM Member"
 msgstr "Usager"
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_id
+msgid "ID"
+msgstr "ID"
+
 #. module: golem_member_minor
 #: model:ir.ui.view,arch_db:golem_member_minor.golem_member_search_inherit_minor
 msgid "Is adult"
 msgstr "Est adulte"
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_is_default_guardian
+msgid "Is default guardian"
+msgstr "Par défaut"
+
 #. module: golem_member_minor
 #: model:ir.ui.view,arch_db:golem_member_minor.golem_member_search_inherit_minor
 msgid "Is minor"
@@ -45,13 +85,61 @@ msgstr "Est mineur"
 msgid "Is minor?"
 msgstr "Est mineur?"
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian___last_update
+msgid "Last Modified on"
+msgstr "Dernière Modification le"
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_write_uid
+msgid "Last Updated by"
+msgstr "Dernière mise à jour par"
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_write_date
+msgid "Last Updated on"
+msgstr "Dernière mise à jour le"
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_legal_guardian_id
+msgid "Legal guardian"
+msgstr "Représentant légal"
+
 #. module: golem_member_minor
 #: model:ir.model.fields,field_description:golem_member_minor.field_golem_member_legal_guardian_ids
 msgid "Legal guardians"
 msgstr "Représentants légaux"
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_member_id
+msgid "Member id"
+msgstr "Usager"
+
 #. module: golem_member_minor
 #: model:ir.ui.view,arch_db:golem_member_minor.golem_member_form_inherit_minor
 msgid "Minor"
 msgstr "Mineur"
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_mobile
+msgid "Mobile"
+msgstr "Mobile"
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_phone
+msgid "Phone"
+msgstr "Téléphone"
+
+#. module: golem_member_minor
+#: code:addons/golem_member_minor/models/golem_legal_guardian.py:29
+#: sql_constraint:golem.legal.guardian:0
+#, python-format
+msgid "There are doubles in your legal guardians. Please check your fills."
+msgstr "Il y a des doublons au niveau des représentants légaux. Merci de vérifier vos saisies."
+
+#. module: golem_member_minor
+#: code:addons/golem_member_minor/models/golem_member.py:65
+#, python-format
+msgid "You must have one and only one default legal guardian. Please check your fills."
+msgstr "Vous ne pouvez avoir qu'un et un seul représentant légal par défaut. Merci de vérifier vos saisies."
+
diff --git a/golem_member_minor/i18n/golem_member_minor.pot b/golem_member_minor/i18n/golem_member_minor.pot
index 2059c34..9fb8945 100644
--- a/golem_member_minor/i18n/golem_member_minor.pot
+++ b/golem_member_minor/i18n/golem_member_minor.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-26 16:15+0000\n"
-"PO-Revision-Date: 2018-08-26 16:15+0000\n"
+"POT-Creation-Date: 2018-10-24 05:59+0000\n"
+"PO-Revision-Date: 2018-10-24 05:59+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -25,16 +25,56 @@ msgstr ""
 msgid "Can leave alone?"
 msgstr ""
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_contact_address
+msgid "Complete Address"
+msgstr ""
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_email
+msgid "Email"
+msgstr ""
+
+#. module: golem_member_minor
+#: model:ir.model,name:golem_member_minor.model_golem_legal_guardian
+msgid "GOLEM Legal Guardian Management"
+msgstr ""
+
 #. module: golem_member_minor
 #: model:ir.model,name:golem_member_minor.model_golem_member
 msgid "GOLEM Member"
 msgstr ""
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_id
+msgid "ID"
+msgstr ""
+
 #. module: golem_member_minor
 #: model:ir.ui.view,arch_db:golem_member_minor.golem_member_search_inherit_minor
 msgid "Is adult"
 msgstr ""
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_is_default_guardian
+msgid "Is default guardian"
+msgstr ""
+
 #. module: golem_member_minor
 #: model:ir.ui.view,arch_db:golem_member_minor.golem_member_search_inherit_minor
 msgid "Is minor"
@@ -45,13 +85,61 @@ msgstr ""
 msgid "Is minor?"
 msgstr ""
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_legal_guardian_id
+msgid "Legal guardian"
+msgstr ""
+
 #. module: golem_member_minor
 #: model:ir.model.fields,field_description:golem_member_minor.field_golem_member_legal_guardian_ids
 msgid "Legal guardians"
 msgstr ""
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_member_id
+msgid "Member id"
+msgstr ""
+
 #. module: golem_member_minor
 #: model:ir.ui.view,arch_db:golem_member_minor.golem_member_form_inherit_minor
 msgid "Minor"
 msgstr ""
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_mobile
+msgid "Mobile"
+msgstr ""
+
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_phone
+msgid "Phone"
+msgstr ""
+
+#. module: golem_member_minor
+#: code:addons/golem_member_minor/models/golem_legal_guardian.py:29
+#: sql_constraint:golem.legal.guardian:0
+#, python-format
+msgid "There are doubles in your legal guardians. Please check your fills."
+msgstr ""
+
+#. module: golem_member_minor
+#: code:addons/golem_member_minor/models/golem_member.py:65
+#, python-format
+msgid "You must have one and only one default legal guardian. Please check your fills."
+msgstr ""
+

From 3dcdd23d90cb9e0eae8e5dbc69056cb465cace75 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Thu, 25 Oct 2018 17:55:49 +0200
Subject: [PATCH 52/52] [REF][FIX]GOLEM Member Minor : membership invoice on
 legal guardians

* Small refacorings ;
* Better require for legal guardian when minor ;
* Adaptations to new legal guardians ;
* Fix on last invoice gathering.
---
 golem_member_minor/__init__.py                |  4 +--
 golem_member_minor/__manifest__.py            |  6 ++--
 golem_member_minor/i18n/fr.po                 | 33 +++++++++++++++++--
 .../i18n/golem_member_minor.pot               | 33 +++++++++++++++++--
 golem_member_minor/models/__init__.py         |  2 +-
 golem_member_minor/models/account_invoice.py  |  5 +--
 golem_member_minor/views/account_invoice.xml  | 10 +++---
 .../views/golem_member_views.xml              |  3 +-
 golem_member_minor/wizard/__init__.py         | 18 ++++++++++
 .../golem_membership_invoice.py}              | 31 ++++++++---------
 .../golem_membership_invoice.xml              | 11 ++++---
 golem_membership/models/golem_membership.py   |  3 +-
 12 files changed, 119 insertions(+), 40 deletions(-)
 create mode 100644 golem_member_minor/wizard/__init__.py
 rename golem_member_minor/{models/golem_membership.py => wizard/golem_membership_invoice.py} (73%)
 rename golem_member_minor/{views => wizard}/golem_membership_invoice.xml (78%)

diff --git a/golem_member_minor/__init__.py b/golem_member_minor/__init__.py
index 82314be..e460319 100644
--- a/golem_member_minor/__init__.py
+++ b/golem_member_minor/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2017-2018 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
@@ -15,4 +15,4 @@
 #    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 models
+from . import models, wizard
diff --git a/golem_member_minor/__manifest__.py b/golem_member_minor/__manifest__.py
index e73665c..9ce8794 100644
--- a/golem_member_minor/__manifest__.py
+++ b/golem_member_minor/__manifest__.py
@@ -19,7 +19,7 @@
 {
     'name': 'GOLEM members minor',
     'summary': 'GOLEM non-profit members minor management',
-    'version': '10.0.1.2.0',
+    'version': '10.0.1.3.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
@@ -28,6 +28,6 @@
     'depends': ['golem_member'],
     'data': ['security/ir.model.access.csv',
              'views/golem_member_views.xml',
-             'views/golem_membership_invoice.xml',
-             'views/account_invoice.xml']
+             'views/account_invoice.xml',
+             'wizard/golem_membership_invoice.xml']
 }
diff --git a/golem_member_minor/i18n/fr.po b/golem_member_minor/i18n/fr.po
index f03e7dc..b642b63 100644
--- a/golem_member_minor/i18n/fr.po
+++ b/golem_member_minor/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-24 05:59+0000\n"
-"PO-Revision-Date: 2018-10-24 08:01+0200\n"
+"POT-Creation-Date: 2018-10-25 15:51+0000\n"
+"PO-Revision-Date: 2018-10-25 17:52+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,11 @@ msgstr "Peut quitter la structure seul?"
 msgid "Complete Address"
 msgstr "Adresse complète"
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_account_invoice_partner_ids
+msgid "Concerned partners"
+msgstr "Contacts concernés"
+
 #. module: golem_member_minor
 #: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_create_uid
 msgid "Created by"
@@ -60,11 +65,21 @@ msgstr "GOLEM Legal Guardian Management"
 msgid "GOLEM Member"
 msgstr "Usager"
 
+#. module: golem_member_minor
+#: model:ir.model,name:golem_member_minor.model_golem_membership_invoice
+msgid "GOLEM MemberShip invoicing"
+msgstr "Facturation de l'adhésion"
+
 #. module: golem_member_minor
 #: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_id
 msgid "ID"
 msgstr "ID"
 
+#. module: golem_member_minor
+#: model:ir.model,name:golem_member_minor.model_account_invoice
+msgid "Invoice"
+msgstr "Facture"
+
 #. module: golem_member_minor
 #: model:ir.ui.view,arch_db:golem_member_minor.golem_member_search_inherit_minor
 msgid "Is adult"
@@ -80,8 +95,14 @@ msgstr "Par défaut"
 msgid "Is minor"
 msgstr "Est mineur"
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_account_invoice_is_minor_invoice
+msgid "Is minor invoice"
+msgstr "Facture sur mineur"
+
 #. module: golem_member_minor
 #: model:ir.model.fields,field_description:golem_member_minor.field_golem_member_is_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_membership_invoice_src_member_minor
 msgid "Is minor?"
 msgstr "Est mineur?"
 
@@ -102,6 +123,7 @@ msgstr "Dernière mise à jour le"
 
 #. module: golem_member_minor
 #: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_legal_guardian_id
+#: model:ir.ui.view,arch_db:golem_member_minor.golem_membership_invoice_form_inherit
 msgid "Legal guardian"
 msgstr "Représentant légal"
 
@@ -130,6 +152,11 @@ msgstr "Mobile"
 msgid "Phone"
 msgstr "Téléphone"
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_membership_invoice_src_member_id
+msgid "Src member id"
+msgstr "Usager"
+
 #. module: golem_member_minor
 #: code:addons/golem_member_minor/models/golem_legal_guardian.py:29
 #: sql_constraint:golem.legal.guardian:0
@@ -138,7 +165,7 @@ msgid "There are doubles in your legal guardians. Please check your fills."
 msgstr "Il y a des doublons au niveau des représentants légaux. Merci de vérifier vos saisies."
 
 #. module: golem_member_minor
-#: code:addons/golem_member_minor/models/golem_member.py:65
+#: code:addons/golem_member_minor/models/golem_member.py:76
 #, python-format
 msgid "You must have one and only one default legal guardian. Please check your fills."
 msgstr "Vous ne pouvez avoir qu'un et un seul représentant légal par défaut. Merci de vérifier vos saisies."
diff --git a/golem_member_minor/i18n/golem_member_minor.pot b/golem_member_minor/i18n/golem_member_minor.pot
index 9fb8945..7227fb6 100644
--- a/golem_member_minor/i18n/golem_member_minor.pot
+++ b/golem_member_minor/i18n/golem_member_minor.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-24 05:59+0000\n"
-"PO-Revision-Date: 2018-10-24 05:59+0000\n"
+"POT-Creation-Date: 2018-10-25 15:51+0000\n"
+"PO-Revision-Date: 2018-10-25 15:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,11 @@ msgstr ""
 msgid "Complete Address"
 msgstr ""
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_account_invoice_partner_ids
+msgid "Concerned partners"
+msgstr ""
+
 #. module: golem_member_minor
 #: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_create_uid
 msgid "Created by"
@@ -60,11 +65,21 @@ msgstr ""
 msgid "GOLEM Member"
 msgstr ""
 
+#. module: golem_member_minor
+#: model:ir.model,name:golem_member_minor.model_golem_membership_invoice
+msgid "GOLEM MemberShip invoicing"
+msgstr ""
+
 #. module: golem_member_minor
 #: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_id
 msgid "ID"
 msgstr ""
 
+#. module: golem_member_minor
+#: model:ir.model,name:golem_member_minor.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
 #. module: golem_member_minor
 #: model:ir.ui.view,arch_db:golem_member_minor.golem_member_search_inherit_minor
 msgid "Is adult"
@@ -80,8 +95,14 @@ msgstr ""
 msgid "Is minor"
 msgstr ""
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_account_invoice_is_minor_invoice
+msgid "Is minor invoice"
+msgstr ""
+
 #. module: golem_member_minor
 #: model:ir.model.fields,field_description:golem_member_minor.field_golem_member_is_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_membership_invoice_src_member_minor
 msgid "Is minor?"
 msgstr ""
 
@@ -102,6 +123,7 @@ msgstr ""
 
 #. module: golem_member_minor
 #: model:ir.model.fields,field_description:golem_member_minor.field_golem_legal_guardian_legal_guardian_id
+#: model:ir.ui.view,arch_db:golem_member_minor.golem_membership_invoice_form_inherit
 msgid "Legal guardian"
 msgstr ""
 
@@ -130,6 +152,11 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
+#. module: golem_member_minor
+#: model:ir.model.fields,field_description:golem_member_minor.field_golem_membership_invoice_src_member_id
+msgid "Src member id"
+msgstr ""
+
 #. module: golem_member_minor
 #: code:addons/golem_member_minor/models/golem_legal_guardian.py:29
 #: sql_constraint:golem.legal.guardian:0
@@ -138,7 +165,7 @@ msgid "There are doubles in your legal guardians. Please check your fills."
 msgstr ""
 
 #. module: golem_member_minor
-#: code:addons/golem_member_minor/models/golem_member.py:65
+#: code:addons/golem_member_minor/models/golem_member.py:76
 #, python-format
 msgid "You must have one and only one default legal guardian. Please check your fills."
 msgstr ""
diff --git a/golem_member_minor/models/__init__.py b/golem_member_minor/models/__init__.py
index cf411d4..32fd987 100644
--- a/golem_member_minor/models/__init__.py
+++ b/golem_member_minor/models/__init__.py
@@ -16,4 +16,4 @@
 #    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, golem_membership, account_invoice, golem_legal_guardian
+from . import golem_member, account_invoice, golem_legal_guardian
diff --git a/golem_member_minor/models/account_invoice.py b/golem_member_minor/models/account_invoice.py
index ea32f07..53cb662 100644
--- a/golem_member_minor/models/account_invoice.py
+++ b/golem_member_minor/models/account_invoice.py
@@ -18,11 +18,12 @@
 
 """ Account Invoice adaptations """
 
-from odoo import models, fields, api
+from odoo import models, fields
 
 class AccountInvoice(models.Model):
     """ Account Invoice adaptations """
     _inherit = 'account.invoice'
 
-    partner_ids = fields.Many2many('res.partner', string="Concerned partners")
+    partner_ids = fields.Many2many('res.partner', string='Concerned partners',
+                                   auto_join=True)
     is_minor_invoice = fields.Boolean()
diff --git a/golem_member_minor/views/account_invoice.xml b/golem_member_minor/views/account_invoice.xml
index 5183a51..fcbb818 100644
--- a/golem_member_minor/views/account_invoice.xml
+++ b/golem_member_minor/views/account_invoice.xml
@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <odoo>
   <data>
+
     <!-- Forms -->
     <record id="account.invoice_form_inherited_member_minor" model="ir.ui.view">
       <field name="name">account.invoice.form.iherited.member.minor</field>
@@ -27,13 +28,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="inherit_id" ref="account.invoice_form" />
       <field name="arch" type="xml">
         <field name='partner_id' position='after'>
-            <field name='is_minor_invoice' invisible="1"/>
-            <field name="partner_ids"
-                   widget="many2many_tags"
-                   readonly="1"
-                   attrs="{'invisible': [('is_minor_invoice', '=', False)]}"/>
+            <field name='is_minor_invoice' invisible="1" />
+            <field name="partner_ids" widget="many2many_tags" readonly="1"
+              attrs="{'invisible': [('is_minor_invoice', '=', False)]}" />
         </field>
       </field>
     </record>
+
   </data>
 </odoo>
diff --git a/golem_member_minor/views/golem_member_views.xml b/golem_member_minor/views/golem_member_views.xml
index 7908ced..ad3eb86 100644
--- a/golem_member_minor/views/golem_member_views.xml
+++ b/golem_member_minor/views/golem_member_views.xml
@@ -39,7 +39,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             </group>
           </page>
         </page>
-        <xpath expr="//page[@name='membership']/group/group/div/button[1]" position="attributes">
+        <xpath expr="//page[@name='membership']/group/group/div/button[1]"
+          position="attributes">
           <attribute name="name">membership_invoice_action</attribute>
           <attribute name="type">object</attribute>
         </xpath>
diff --git a/golem_member_minor/wizard/__init__.py b/golem_member_minor/wizard/__init__.py
new file mode 100644
index 0000000..bd92ed2
--- /dev/null
+++ b/golem_member_minor/wizard/__init__.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2018 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 . import golem_membership_invoice
diff --git a/golem_member_minor/models/golem_membership.py b/golem_member_minor/wizard/golem_membership_invoice.py
similarity index 73%
rename from golem_member_minor/models/golem_membership.py
rename to golem_member_minor/wizard/golem_membership_invoice.py
index 512ab0e..e7c74d1 100644
--- a/golem_member_minor/models/golem_membership.py
+++ b/golem_member_minor/wizard/golem_membership_invoice.py
@@ -26,30 +26,31 @@ class GolemMembershipInvoice(models.TransientModel):
     _inherit = 'golem.membership.invoice'
 
 
-    src_member_id = fields.Many2one('golem.member')
-    partner_id = fields.Many2one(required=True)
+    src_member_id = fields.Many2one('golem.member', ondelete='cascade')
+    src_member_minor = fields.Boolean(related='src_member_id.is_minor')
 
     @api.onchange('src_member_id')
     def onchange_member(self):
         """ Set partner domain if src_member_id is filled """
-        record = self[0]
-        if record.src_member_id.is_minor:
-            return {'domain': {'partner_id':
-                               [('id', 'in', record.src_member_id.legal_guardian_ids.ids)]
-                              }
-                   }
+        self.ensure_one()
+        record  = self[0]
+        domain = ([('id', 'in',
+                    record.src_member_id.mapped('legal_guardian_ids.legal_guardian_id').ids)]
+                  if record.src_member_id.is_minor else [])
+        return {'domain': {'partner_id': domain}}
+
     @api.multi
     def membership_invoice(self):
-        """ Add partners concerned to invoice and move membership from legal guardian to minor """
+        """ Add partners concerned to invoice and move membership from legal
+        guardian to minor """
         self.ensure_one()
         record = self[0]
         res = super(GolemMembershipInvoice, self).membership_invoice()
-        if record.src_member_id and record.src_member_id.is_minor:
-            #gettin invoice_id from action's domain already declared
-            invoice_id = (res['domain'][0][2] if
-                          res['domain'][0][2] else False)
-            if invoice_id:
-                invoice = self.env['account.invoice'].browse(invoice_id)
+        if record.src_member_id.is_minor:
+            # Getting invoice IDS from action's domain already declared
+            invoice_ids = (res['domain'][0][2] or False)
+            if invoice_ids: # As invoice_ids is a Python list, empty or not
+                invoice = self.env['account.invoice'].browse(invoice_ids)[-1]
                 invoice.is_minor_invoice = True
                 invoice.partner_ids = [(6, 0, [record.partner_id.id,
                                                record.src_member_id.partner_id.id])]
diff --git a/golem_member_minor/views/golem_membership_invoice.xml b/golem_member_minor/wizard/golem_membership_invoice.xml
similarity index 78%
rename from golem_member_minor/views/golem_membership_invoice.xml
rename to golem_member_minor/wizard/golem_membership_invoice.xml
index c9ba6f4..1854442 100644
--- a/golem_member_minor/views/golem_membership_invoice.xml
+++ b/golem_member_minor/wizard/golem_membership_invoice.xml
@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <odoo>
   <data>
+
     <!-- Forms -->
     <record id="golem_membership_invoice_form_inherit" model="ir.ui.view">
       <field name="name">membership.invoice.view.form_iherit</field>
@@ -27,12 +28,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="inherit_id" ref="golem_membership.golem_membership_invoice_form" />
       <field name="arch" type="xml">
         <field name='product_id' position='before'>
-            <field name='partner_id'
-                   attrs="{'invisible': [('src_member_id', '=', False)]}"
-                   options="{'no_create': True}"/>
-            <field name='src_member_id' invisible="1"/>
+            <field name='src_member_id' invisible="1" />
+            <field name='src_member_minor' invisible="1" />
+            <field name='partner_id' string="Legal guardian"
+              options="{'no_create': True}"
+              attrs="{'invisible': [('src_member_id', '=', False)], 'required': [('src_member_minor', '=', True)]}" />
         </field>
       </field>
     </record>
+
   </data>
 </odoo>
diff --git a/golem_membership/models/golem_membership.py b/golem_membership/models/golem_membership.py
index 3c4dbcf..85ed4f9 100644
--- a/golem_membership/models/golem_membership.py
+++ b/golem_membership/models/golem_membership.py
@@ -26,7 +26,8 @@ class GolemMembershipInvoice(models.TransientModel):
     _name = 'golem.membership.invoice'
     _description = 'GOLEM MemberShip invoicing'
 
-    partner_id = fields.Many2one('res.partner', 'Partner')
+    partner_id = fields.Many2one('res.partner', 'Partner', required=True,
+                                 ondelete='cascade')
     product_id = fields.Many2one('product.product', 'Membership',
                                  required=True)
     member_price = fields.Float('Member Price',