From 06cd0a1c7f99cb742a182a654f27e96f982b9d5b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 16 Apr 2013 11:34:03 +0200
Subject: [PATCH] [FIX] res.partner: avoid hiding `parent_id` and `child_ids`
 fields if they are set, irregardless of the rest of the `is_company` flag

This prevents hiding real data and also allows creating more
complex/flexible structures by setting the values of these
fields before or after setting is_company, to reach the
desired result.

bzr revid: odo@openerp.com-20130416093403-9m484d30qqq5ab8l
---
 openerp/addons/base/res/res_partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 7c414da5966..ce97cba4992 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -139,7 +139,7 @@
                         <field name="parent_id"
                             placeholder="Company"
                             domain="[('is_company', '=', True)]" context="{'default_is_company': True, 'default_supplier': supplier}"
-                            attrs="{'invisible': [('is_company','=', True)]}"
+                            attrs="{'invisible': [('is_company','=', True),('parent_id', '=', False)]}"
                             on_change="onchange_address(use_parent_address, parent_id)"/>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
@@ -185,7 +185,7 @@
                     </group>
 
                     <notebook colspan="4">
-                        <page string="Contacts" attrs="{'invisible': [('is_company','=',False)]}" autofocus="autofocus">
+                        <page string="Contacts" attrs="{'invisible': [('is_company','=',False), ('child_ids', '=', False)]}" autofocus="autofocus">
                             <field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_supplier': supplier}">
                                 <kanban>
                                     <field name="color"/>