From 189eccba4170140861870b527d79511ef5eb88bf Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Wed, 1 Aug 2018 11:19:43 +0200
Subject: [PATCH] [IMP]GOLEM Family : on partner form, always visible

---
 golem_family/__manifest__.py             |  2 +-
 golem_family/views/res_partner_views.xml | 21 +++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/golem_family/__manifest__.py b/golem_family/__manifest__.py
index d8a076c..be2bb7f 100644
--- a/golem_family/__manifest__.py
+++ b/golem_family/__manifest__.py
@@ -19,7 +19,7 @@
     'name': 'GOLEM families',
     'summary': 'GOLEM Members Families',
     'description': 'GOLEM Members Families',
-    'version': '10.0.2.2.3',
+    'version': '10.0.2.2.4',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
diff --git a/golem_family/views/res_partner_views.xml b/golem_family/views/res_partner_views.xml
index 877fd93..d2104dd 100644
--- a/golem_family/views/res_partner_views.xml
+++ b/golem_family/views/res_partner_views.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="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 published by
@@ -25,6 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="model">res.partner</field>
       <field name="inherit_id" ref="base.view_partner_form" />
       <field name="arch" type="xml">
+        <field name="type" position="after">
+          <field name="family_id" attrs="{'invisible': [('is_company', '=', True)]}" />
+          <field name="family_role" attrs="{'invisible': [('is_company', '=', True)]}" />
+        </field>
         <div name="button_box" position="inside">
           <button class="oe_inline oe_stat_button" type="object"
             name="button_family_members" icon="fa-users"
@@ -36,20 +40,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       </field>
     </record>
 
-    <record model="ir.ui.view" id="partner_firstname_inherit_golem_family_role">
-      <field name="name">Partner form adaptations</field>
-      <field name="model">res.partner</field>
-      <field name="inherit_id"
-        ref="partner_firstname.view_partner_form_firstname" />
-      <field name="arch" type="xml">
-        <field name="lastname" position="before">
-          <field name="family_id"
-            attrs="{'invisible': [('is_company', '=', True)]}" />
-          <field name="family_role"
-            attrs="{'invisible': [('is_company', '=', True)]}" />
-        </field>
-      </field>
-    </record>
-
   </data>
 </odoo>