From 15805173c84192f668364ad7834b0403f3a92348 Mon Sep 17 00:00:00 2001
From: Nicolas JEUDY <nicolas@sudokeys.com>
Date: Sat, 3 Dec 2016 13:31:44 +0100
Subject: [PATCH] [FIX] fixes on lastest comments

- better readability
- remove <data></data> tags
---
 .../models/res_partner.py                              |  6 ++----
 .../views/res_partner.xml                              | 10 ----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/partner_contact_in_several_companies/models/res_partner.py b/partner_contact_in_several_companies/models/res_partner.py
index b33d486e6..cc8e57406 100644
--- a/partner_contact_in_several_companies/models/res_partner.py
+++ b/partner_contact_in_several_companies/models/res_partner.py
@@ -28,10 +28,8 @@ class ResPartner(models.Model):
     @api.multi
     @api.depends('contact_id')
     def _get_contact_type(self):
-        for record in self:
-            record.contact_type = record.contact_id \
-                and 'attached' \
-                or 'standalone'
+        for rec in self:
+            rec.contact_type = 'attached' if rec.contact_id else 'standalone'
 
     def _basecontact_check_context(self, mode):
         """ Remove 'search_show_all_positions' for non-search mode.
diff --git a/partner_contact_in_several_companies/views/res_partner.xml b/partner_contact_in_several_companies/views/res_partner.xml
index 003e4e03f..4cd6906c8 100644
--- a/partner_contact_in_several_companies/views/res_partner.xml
+++ b/partner_contact_in_several_companies/views/res_partner.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-<data>
-
 <record id="view_res_partner_filter_contact" model="ir.ui.view">
     <field name="name">res.partner.select.contact</field>
     <field name="model">res.partner</field>
@@ -123,12 +121,6 @@
                 </field>
             </page>
         </page>
-        <!-- <xpath expr="//field[@name='category_id']" position="before">
-            <group attrs="{'invisible': [('is_company','=',True)]}">
-                <label for="contact_type" class="oe_edit_only"/>
-                <field name="contact_type" readonly="0" nolabel="1"/>
-            </group>
-        </xpath> -->
         <xpath expr="//field[@name='child_ids']/form//field[@name='name']" position="before">
             <field name='contact_type' readonly='0'/>
             <field name="contact_id" string="Contact"
@@ -187,6 +179,4 @@
         </xpath>
     </field>
 </record>
-
-</data>
 </odoo>