From 17f082a5250ab60eb382839036bcc3ef780a99cd Mon Sep 17 00:00:00 2001
From: Sandy Carter <sandy.carter@savoirfairelinux.com>
Date: Wed, 5 Nov 2014 17:24:23 -0500
Subject: [PATCH 1/3] Remove "Is a Company" in Contact Creation page

Contact creation is not a place to change Is a Company
---
 partner_firstname/partner_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/partner_firstname/partner_view.xml b/partner_firstname/partner_view.xml
index 9a88c6e80..a4c411d6e 100644
--- a/partner_firstname/partner_view.xml
+++ b/partner_firstname/partner_view.xml
@@ -43,9 +43,8 @@
         </xpath>
         <xpath expr="//form[@string='Contact']/sheet/div/label" position="replace">
             <div class="oe_edit_only">
+                <field name="is_company" on_change="onchange_type(is_company)" invisible="1"/>
                 <label for="name"/> (
-                <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/>
-                <label for="is_company" string="Is a Company?"/>)
             </div>
         </xpath>
         <xpath expr="//form[@string='Contact']/sheet/div/h1/field[@name='name']" position="attributes">

From 5833150713d386303e8a13d3b02c094aa0eee761 Mon Sep 17 00:00:00 2001
From: Sandy Carter <sandy.carter@savoirfairelinux.com>
Date: Wed, 5 Nov 2014 17:24:50 -0500
Subject: [PATCH 2/3] Remove name label is child Contact creation

---
 partner_firstname/partner_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/partner_firstname/partner_view.xml b/partner_firstname/partner_view.xml
index a4c411d6e..02eac7e5b 100644
--- a/partner_firstname/partner_view.xml
+++ b/partner_firstname/partner_view.xml
@@ -44,7 +44,6 @@
         <xpath expr="//form[@string='Contact']/sheet/div/label" position="replace">
             <div class="oe_edit_only">
                 <field name="is_company" on_change="onchange_type(is_company)" invisible="1"/>
-                <label for="name"/> (
             </div>
         </xpath>
         <xpath expr="//form[@string='Contact']/sheet/div/h1/field[@name='name']" position="attributes">

From 7eeb62df4992c5acea25b89a26a7114cbc172adb Mon Sep 17 00:00:00 2001
From: Sandy Carter <sandy.carter@savoirfairelinux.com>
Date: Wed, 5 Nov 2014 18:03:32 -0500
Subject: [PATCH 3/3] Take out dynamic required and invisible

Contacts are never companies
Add labels
---
 partner_firstname/partner_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/partner_firstname/partner_view.xml b/partner_firstname/partner_view.xml
index 02eac7e5b..2b68113da 100644
--- a/partner_firstname/partner_view.xml
+++ b/partner_firstname/partner_view.xml
@@ -33,10 +33,12 @@
         </field>
         <!-- Add firstname and last name in inner contact form of child_ids -->
         <xpath expr="//form[@string='Contact']/sheet//field[@name='category_id']" position="before">
-           <group attrs="{'invisible': [('is_company', '=', True)]}">
-            <field name="lastname" attrs="{'required': [('is_company', '=', False)]}"/>
-            <field name="firstname"/>
-           </group> 
+          <group>
+            <label for="lastname" class="oe_edit_only"/>
+            <field name="lastname" required="1" nolabel="1"/>
+            <label for="firstname" class="oe_edit_only"/>
+            <field name="firstname" nolabel="1"/>
+          </group>
         </xpath>
         <xpath expr="//form[@string='Contact']/sheet//field[@name='category_id']" position="attributes">
             <attribute name="style"/>