diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index a4da32d3d57..8f79e653453 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -122,7 +122,7 @@ class res_partner(osv.osv):
     _name = "res.partner"
     _order = "name"
     _columns = {
-        'name': fields.char('Name', size=128, required=True, select=True),
+        'name': fields.char('Name', size=128, select=True),
         'date': fields.date('Date', select=1),
         'title': fields.many2one('res.partner.title','Title'),
         'parent_id': fields.many2one('res.partner','Parent Partner'),
@@ -155,7 +155,7 @@ class res_partner(osv.osv):
         'fax': fields.char('Fax', size=64),
         'mobile': fields.char('Mobile', size=64),
         'birthdate': fields.char('Birthdate', size=64),
-        'is_company': fields.selection( [ ('contact','Person'),('partner','Company') ],'Contact Type', help="Select if the partner is a company or person",required=True),
+        'is_company': fields.selection( [ ('contact','Person'),('partner','Company') ],'Contact Type', help="Select if the partner is a company or person"),
         'use_parent_address': fields.boolean('Use Company Address', help="Check to use the company's address"),
         'photo': fields.binary('Photo'),
         'company_id': fields.many2one('res.company', 'Company', select=1),
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index d38a6a68511..b558c7610fb 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -93,53 +93,56 @@
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">www.asustek.com</field>
         </record>
         <record id="res_partner_agrolait" model="res.partner">
             <field name="name">Agrolait</field>
             <field eval="[(6, 0, [ref('base.res_partner_category_0')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">www.agrolait.com</field>
         </record>
         <record id="res_partner_c2c" model="res.partner">
             <field name="name">Camptocamp</field>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_10'), ref('res_partner_category_5')])]" name="category_id"/>
             <field name="supplier">1</field>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">www.camptocamp.com</field>
         </record>
         <record id="res_partner_sednacom" model="res.partner">
             <field name="website">www.syleam.fr</field>
             <field name="name">Syleam</field>
             <field eval="[(6, 0, [ref('res_partner_category_5')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
         </record>
         <record id="res_partner_thymbra" model="res.partner">
             <field name="name">SmartBusiness</field>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
         </record>
         <record id="res_partner_desertic_hispafuentes" model="res.partner">
             <field name="name">Axelor</field>
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
             <field name="supplier">1</field>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">www.axelor.com/</field>
         </record>
         <record id="res_partner_tinyatwork" model="res.partner">
             <field name="name">Tiny AT Work</field>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_5'), ref('res_partner_category_10')])]" name="category_id"/>
             <field name="website">www.tinyatwork.com/</field>
         </record>
         <record id="res_partner_2" model="res.partner">
             <field name="name">Bank Wealthy and sons</field>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">www.wealthyandsons.com/</field>
         </record>
         <record id="res_partner_3" model="res.partner">
             <field name="name">China Export</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">www.chinaexport.com/</field>
         </record>
         <record id="res_partner_4" model="res.partner">
@@ -147,13 +150,13 @@
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">www.distribpc.com/</field>
         </record>
         <record id="res_partner_5" model="res.partner">
             <field name="name">Ecole de Commerce de Liege</field>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">www.eci-liege.info//</field>
         </record>
         <record id="res_partner_6" model="res.partner">
@@ -161,7 +164,7 @@
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
         </record>
         <record id="res_partner_maxtor" model="res.partner">
             <field name="name">Maxtor</field>
@@ -169,20 +172,20 @@
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
         </record>
         <record id="res_partner_seagate" model="res.partner">
             <field name="name">Seagate</field>
             <field eval="5000.00" name="credit_limit"/>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
         </record>
         <record id="res_partner_8" model="res.partner">
             <field name="website">http://mediapole.net</field>
             <field name="name">Mediapole SPRL</field>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
         </record>
         <record id="res_partner_9" model="res.partner">
             <field name="website">www.balmerinc.com</field>
@@ -190,19 +193,19 @@
             <field eval="12000.00" name="credit_limit"/>
             <field name="ref">or</field>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
         </record>
         <record id="res_partner_10" model="res.partner">
             <field name="name">Tecsas</field>
             <field name="ean13">3020170000003</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
         </record>
         <record id="res_partner_11" model="res.partner">
             <field name="name">Leclerc</field>
             <field eval="1200.00" name="credit_limit"/>
             <field eval="[(6, 0, [ref('res_partner_category_0')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
         </record>
         <record id="res_partner_14" model="res.partner">
             <field name="name">Centrale d'achats BML</field>
@@ -210,7 +213,7 @@
             <field eval="15000.00" name="credit_limit"/>
             <field name="parent_id" ref="res_partner_10"/>
             <field eval="[(6, 0, [ref('res_partner_category_11')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
         </record>
         <record id="res_partner_15" model="res.partner">
             <field name="name">Magazin BML 1</field>
@@ -218,12 +221,12 @@
             <field name="parent_id" ref="res_partner_14"/>
             <field eval="1500.00" name="credit_limit"/>
             <field eval="[(6, 0, [ref('res_partner_category_11')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
         </record>
         <record id="res_partner_accent" model="res.partner">
             <field name="name">Université de Liège</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">http://www.ulg.ac.be/</field>
         </record>
 
@@ -238,7 +241,7 @@
             <field name="website">http://www.dubois.be/</field>
         </record>
 
-        <record id="res_partner_ericdubois0" model="res.partner">
+        <!--record id="res_partner_ericdubois0" model="res.partner">
             <field name="name">Eric Dubois</field>
             <field name="address" eval="[]"/>
         </record>
@@ -246,23 +249,23 @@
         <record id="res_partner_fabiendupont0" model="res.partner">
             <field name="name">Fabien Dupont</field>
             <field name="address" eval="[]"/>
-        </record>
+        </record-->
 
         <record id="res_partner_lucievonck0" model="res.partner">
             <field name="name">Lucie Vonck</field>
             <field name="address" eval="[]"/>
         </record>
 
-        <record id="res_partner_notsotinysarl0" model="res.partner">
+        <!--record id="res_partner_notsotinysarl0" model="res.partner">
             <field name="name">NotSoTiny SARL</field>
             <field name="address" eval="[]"/>
             <field name="website">notsotiny.be</field>
-        </record>
+        </record-->
 
         <record id="res_partner_theshelvehouse0" model="res.partner">
             <field name="name">The Shelve House</field>
             <field eval="[(6,0,[ref('res_partner_category_retailers0')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
         </record>
 
         <record id="res_partner_vickingdirect0" model="res.partner">
@@ -270,7 +273,7 @@
             <field eval="[(6,0,[ref('res_partner_category_miscellaneoussuppliers0')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field name="customer">0</field>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">vicking-direct.be</field>
         </record>
 
@@ -279,14 +282,14 @@
             <field eval="[(6,0,[ref('res_partner_category_woodsuppliers0')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">woodywoodpecker.com</field>
         </record>
 
         <record id="res_partner_zerooneinc0" model="res.partner">
             <field name="name">ZeroOne Inc</field>
             <field eval="[(6,0,[ref('res_partner_category_consumers0')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="is_company">partner</field>
             <field name="website">http://www.zerooneinc.com/</field>
         </record>
 
@@ -294,7 +297,7 @@
         Resource: res.partner.address
         -->
 
-        <record id="res_partner_address_1" model="res.partner.address">
+        <record id="res_partner_address_1" model="res.partner">
             <field name="city">Bruxelles</field>
             <field name="name">Michel Schumacher</field>
             <field name="zip">1000</field>
@@ -303,9 +306,9 @@
             <field name="phone">(+32)2 211 34 83</field>
             <field name="street">Rue des Palais 51, bte 33</field>
             <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_9"/>
+            <field name="parent_id" ref="res_partner_9"/>
         </record>
-        <record id="res_partner_address_2" model="res.partner.address">
+        <record id="res_partner_address_2" model="res.partner">
             <field name="city">Avignon CEDEX 09</field>
             <field name="name">Laurent Jacot</field>
             <field name="zip">84911</field>
@@ -314,9 +317,9 @@
             <field name="phone">(+33)4.32.74.10.57</field>
             <field name="street">85 rue du traite de Rome</field>
             <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_10"/>
+            <field name="parent_id" ref="res_partner_10"/>
         </record>
-        <record id="res_partner_address_3000" model="res.partner.address">
+        <record id="res_partner_address_3000" model="res.partner">
             <field name="city">Champs sur Marne</field>
             <field name="name">Laith Jubair</field>
             <field name="zip">77420</field>
@@ -325,18 +328,18 @@
             <field name="phone">+33 1 64 61 04 01</field>
             <field name="street">12 rue Albert Einstein</field>
             <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_desertic_hispafuentes"/>
+            <field name="parent_id" ref="res_partner_desertic_hispafuentes"/>
         </record>
-        <record id="res_partner_address_3" model="res.partner.address">
+        <record id="res_partner_address_3" model="res.partner">
             <field name="city">Louvain-la-Neuve</field>
             <field name="name">Thomas Passot</field>
             <field name="zip">1348</field>
             <field model="res.country" name="country_id" search="[('name','=','Belgium')]"/>
             <field name="phone">(+32).10.45.17.73</field>
             <field name="street">Rue de l'Angelique, 1</field>
-            <field name="partner_id" ref="res_partner_8"/>
+            <field name="parent_id" ref="res_partner_8"/>
         </record>
-        <record id="res_partner_address_tang" model="res.partner.address">
+        <record id="res_partner_address_tang" model="res.partner">
             <field name="city">Taiwan</field>
             <field name="name">Tang</field>
             <field name="zip">23410</field>
@@ -345,9 +348,9 @@
             <field name="email">info@asustek.com</field>
             <field name="phone">+ 1 64 61 04 01</field>
             <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_asus"/>
+            <field name="parent_id" ref="res_partner_asus"/>
         </record>
-        <record id="res_partner_address_wong" model="res.partner.address">
+        <record id="res_partner_address_wong" model="res.partner">
             <field name="city">Hong Kong</field>
             <field name="name">Wong</field>
             <field name="zip">23540</field>
@@ -356,9 +359,9 @@
             <field name="email">info@maxtor.com</field>
             <field name="phone">+ 11 8528 456 789</field>
             <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_maxtor"/>
+            <field name="parent_id" ref="res_partner_maxtor"/>
         </record>
-        <record id="res_partner_address_6" model="res.partner.address">
+        <record id="res_partner_address_6" model="res.partner">
             <field name="city">Brussels</field>
             <field name="name">Etienne Lacarte</field>
             <field name="zip">2365</field>
@@ -367,9 +370,9 @@
             <field name="type">default</field>
             <field name="email">info@elecimport.com</field>
             <field name="phone">+ 32 025 897 456</field>
-            <field name="partner_id" ref="res_partner_6"/>
+            <field name="parent_id" ref="res_partner_6"/>
         </record>
-        <record id="res_partner_address_7" model="res.partner.address">
+        <record id="res_partner_address_7" model="res.partner">
             <field name="city">Namur</field>
             <field name="name">Jean Guy Lavente</field>
             <field name="zip">2541</field>
@@ -378,9 +381,9 @@
             <field name="type">default</field>
             <field name="email">info@distribpc.com</field>
             <field name="phone">+ 32 081256987</field>
-            <field name="partner_id" ref="res_partner_4"/>
+            <field name="parent_id" ref="res_partner_4"/>
         </record>
-        <record id="res_partner_address_8" model="res.partner.address">
+        <record id="res_partner_address_8" model="res.partner">
             <field name="city">Wavre</field>
             <field name="name">Sylvie Lelitre</field>
             <field name="zip">5478</field>
@@ -389,10 +392,10 @@
             <field name="type">default</field>
 	    <field name="email">s.l@agrolait.be</field>
 	    <field name="phone">003281588558</field>
-            <field name="partner_id" ref="res_partner_agrolait"/>
+            <field name="parent_id" ref="res_partner_agrolait"/>
             <field name="title" ref="base.res_partner_title_madam"/>
         </record>
-        <record id="res_partner_address_8delivery" model="res.partner.address">
+        <record id="res_partner_address_8delivery" model="res.partner">
             <field name="city">Wavre</field>
             <field name="name">Paul Lelitre</field>
             <field name="zip">5478</field>
@@ -401,10 +404,10 @@
             <field name="type">delivery</field>
 	    <field name="email">p.l@agrolait.be</field>
 	    <field name="phone">003281588557</field>
-            <field name="partner_id" ref="res_partner_agrolait"/>
+            <field name="parent_id" ref="res_partner_agrolait"/>
             <field name="title" ref="base.res_partner_title_sir"/>
         </record>
-        <record id="res_partner_address_8invoice" model="res.partner.address">
+        <record id="res_partner_address_8invoice" model="res.partner">
             <field name="city">Wavre</field>
             <field name="name">Serge Lelitre</field>
             <field name="zip">5478</field>
@@ -413,10 +416,10 @@
             <field name="type">invoice</field>
 	    <field name="email">serge.l@agrolait.be</field>
 	    <field name="phone">003281588556</field>
-            <field name="partner_id" ref="res_partner_agrolait"/>
+            <field name="parent_id" ref="res_partner_agrolait"/>
             <field name="title" ref="base.res_partner_title_sir"/>
         </record>
-        <record id="res_partner_address_9" model="res.partner.address">
+        <record id="res_partner_address_9" model="res.partner">
             <field name="city">Paris</field>
             <field name="name">Arthur Grosbonnet</field>
             <field name="zip">75016</field>
@@ -425,10 +428,10 @@
             <field name="type">default</field>
 	    <field name="email">a.g@wealthyandsons.com</field>
 	    <field name="phone">003368978776</field>
-            <field name="partner_id" ref="res_partner_2"/>
+            <field name="parent_id" ref="res_partner_2"/>
             <field name="title" ref="base.res_partner_title_sir"/>
         </record>
-        <record id="res_partner_address_11" model="res.partner.address">
+        <record id="res_partner_address_11" model="res.partner">
             <field name="city">Alencon</field>
             <field name="name">Sebastien LANGE</field>
             <field name="zip">61000</field>
@@ -437,9 +440,9 @@
             <field name="phone">+33 (0) 2 33 31 22 10</field>
             <field model="res.country" name="country_id" search="[('name','=','France')]"/>
             <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_sednacom"/>
+            <field name="parent_id" ref="res_partner_sednacom"/>
         </record>
-        <record id="res_partner_address_10" model="res.partner.address">
+        <record id="res_partner_address_10" model="res.partner">
             <field name="city">Liege</field>
             <field name="name">Karine Lesbrouffe</field>
             <field name="zip">6985</field>
@@ -448,9 +451,9 @@
 	    <field name="email">k.lesbrouffe@eci-liege.info</field>
 	    <field name="phone">+32 421 52571</field>
             <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_5"/>
+            <field name="parent_id" ref="res_partner_5"/>
         </record>
-        <record id="res_partner_address_zen" model="res.partner.address">
+        <record id="res_partner_address_zen" model="res.partner">
             <field name="city">Shanghai</field>
             <field name="name">Zen</field>
             <field name="zip">478552</field>
@@ -459,9 +462,9 @@
             <field name="type">default</field>
 	    <field name="email">zen@chinaexport.com</field>
 	    <field name="phone">+86-751-64845671</field>
-            <field name="partner_id" ref="res_partner_3"/>
+            <field name="parent_id" ref="res_partner_3"/>
         </record>
-        <record id="res_partner_address_12" model="res.partner.address">
+        <record id="res_partner_address_12" model="res.partner">
             <field name="type">default</field>
   	    <field name="city">Grenoble</field>
             <field name="name">Loïc Dupont</field>
@@ -471,9 +474,9 @@
             <field name="type">default</field>
 	    <field name="email">l.dupont@tecsas.fr</field>
 	    <field name="phone">+33-658-256545</field>
-            <field name="partner_id" ref="res_partner_10"/>
+            <field name="parent_id" ref="res_partner_10"/>
         </record>
-        <record id="res_partner_address_13" model="res.partner.address">
+        <record id="res_partner_address_13" model="res.partner">
             <field name="type">default</field>
             <field name="name">Carl François</field>
 	    <field name="city">Bruxelles</field>
@@ -482,9 +485,9 @@
             <field name="street">89 Chaussée de Waterloo</field>
 	    <field name="email">carl.françois@bml.be</field>
 	    <field name="phone">+32-258-256545</field>
-            <field name="partner_id" ref="res_partner_14"/>
+            <field name="parent_id" ref="res_partner_14"/>
         </record>
-        <record id="res_partner_address_14" model="res.partner.address">
+        <record id="res_partner_address_14" model="res.partner">
             <field name="type">default</field>
             <field name="name">Lucien Ferguson</field>
             <field name="street">89 Chaussée de Liège</field>
@@ -492,9 +495,9 @@
             <field name="zip">5000</field>
 	    <field name="email">lucien.ferguson@bml.be</field>
 	    <field name="phone">+32-621-568978</field>
-            <field name="partner_id" ref="res_partner_15"/>
+            <field name="parent_id" ref="res_partner_15"/>
         </record>
-        <record id="res_partner_address_15" model="res.partner.address">
+        <record id="res_partner_address_15" model="res.partner">
             <field name="type">default</field>
             <field name="name">Marine Leclerc</field>
             <field name="street">rue Grande</field>
@@ -502,9 +505,9 @@
             <field name="zip">29200</field>
 	    <field name="email">marine@leclerc.fr</field>
 	    <field name="phone">+33-298.334558</field>
-            <field name="partner_id" ref="res_partner_11"/>
+            <field name="parent_id" ref="res_partner_11"/>
         </record>
-        <record id="res_partner_address_16" model="res.partner.address">
+        <record id="res_partner_address_16" model="res.partner">
             <field name="type">invoice</field>
             <field name="name">Claude Leclerc</field>
             <field name="street">rue Grande</field>
@@ -512,10 +515,10 @@
             <field name="zip">29200</field>
 	    <field name="email">claude@leclerc.fr</field>
 	    <field name="phone">+33-298.334598</field>
-            <field name="partner_id" ref="res_partner_11"/>
+            <field name="parent_id" ref="res_partner_11"/>
         </record>
 
-        <record id="res_partner_address_accent" model="res.partner.address">
+        <record id="res_partner_address_accent" model="res.partner">
             <field name="type">default</field>
             <field name="name">Martine Ohio</field>
             <field name="street">Place du 20Août</field>
@@ -523,9 +526,9 @@
             <field name="zip">4000</field>
 	    <field name="email">martine.ohio@ulg.ac.be</field>
 	    <field name="phone">+32-45895245</field>
-            <field name="partner_id" ref="res_partner_accent"/>
+            <field name="parent_id" ref="res_partner_accent"/>
         </record>
-        <record id="res_partner_address_Camptocamp" model="res.partner.address">
+        <record id="res_partner_address_Camptocamp" model="res.partner">
             <field name="city">Lausanne</field>
             <field name="name">Luc Maurer</field>
             <field name="zip">1015</field>
@@ -533,9 +536,9 @@
             <field model="res.country" name="country_id" search="[('name','=','Switzerland')]"/>
             <field name="street">PSE-A, EPFL </field>
             <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_c2c"/>
+            <field name="parent_id" ref="res_partner_c2c"/>
         </record>
-        <record id="res_partner_address_seagate" model="res.partner.address">
+        <record id="res_partner_address_seagate" model="res.partner">
             <field name="city">Cupertino</field>
             <field name="name">Seagate Technology</field>
             <field name="zip">95014</field>
@@ -544,9 +547,9 @@
             <field name="email">info@seagate.com</field>
             <field name="phone">+1 408 256987</field>
             <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_seagate"/>
+            <field name="parent_id" ref="res_partner_seagate"/>
         </record>
-        <record id="res_partner_address_thymbra" model="res.partner.address">
+        <record id="res_partner_address_thymbra" model="res.partner">
             <field name="city">Buenos Aires</field>
             <field name="name">Jack Daniels</field>
             <field name="zip">1659</field>
@@ -556,9 +559,9 @@
             <field name="phone">(5411) 4773-9666 </field>
             <field model="res.country" name="country_id" search="[('name','=','Argentina')]"/>
             <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_thymbra"/>
+            <field name="parent_id" ref="res_partner_thymbra"/>
         </record>
-        <record id="res_partner_address_tinyatwork" model="res.partner.address">
+        <record id="res_partner_address_tinyatwork" model="res.partner">
             <field name="city">Boston</field>
             <field name="name">Tiny Work</field>
             <field name="zip">5501</field>
@@ -567,18 +570,18 @@
             <field model="res.country" name="country_id" search="[('name','=','United States')]"/>
             <field name="street">One Lincoln Street</field>
             <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_tinyatwork"/>
+            <field name="parent_id" ref="res_partner_tinyatwork"/>
         </record>
 
         <!--
         Resource: res.partner.address for Training
         -->
 
-        <record id="res_partner_address_notsotinysarl0" model="res.partner.address">
+        <record id="res_partner_address_notsotinysarl0" model="res.partner">
             <field eval="'Namur'" name="city"/>
             <field eval="'NotSoTiny SARL'" name="name"/>
             <field eval="'5000'" name="zip"/>
-            <field name="partner_id" ref="res_partner_notsotinysarl0"/>
+            <!--field name="parent_id" ref="res_partner_notsotinysarl0"/-->
             <field name="country_id" ref="base.be"/>
             <field eval="'(+32).81.81.37.00'" name="phone"/>
             <field eval="'Rue du Nid 1'" name="street"/>
@@ -586,42 +589,42 @@
         </record>
 
 
-        <record id="res_partner_address_henrychard0" model="res.partner.address">
+        <record id="res_partner_address_henrychard0" model="res.partner">
             <field eval="'Paris'" name="city"/>
             <field eval="'Henry Chard'" name="name"/>
             <field name="country_id" ref="base.fr"/>
         </record>
 
 
-        <record id="res_partner_address_geoff0" model="res.partner.address">
+        <record id="res_partner_address_geoff0" model="res.partner">
             <field eval="'Brussels'" name="city"/>
             <field eval="'Geoff'" name="name"/>
             <field name="country_id" ref="base.be"/>
         </record>
 
 
-        <record id="res_partner_address_rogerpecker0" model="res.partner.address">
+        <record id="res_partner_address_rogerpecker0" model="res.partner">
             <field eval="'Kainuu'" name="city"/>
             <field eval="'Roger Pecker'" name="name"/>
             <field name="country_id" ref="base.fi"/>
         </record>
 
 
-        <record id="res_partner_address_0" model="res.partner.address">
+        <record id="res_partner_address_0" model="res.partner">
             <field eval="'Brussels'" name="city"/>
             <field name="country_id" ref="base.be"/>
         </record>
 
 
-        <record id="res_partner_address_henrychard1" model="res.partner.address">
+        <record id="res_partner_address_henrychard1" model="res.partner">
             <field eval="'Paris'" name="city"/>
             <field eval="'Henry Chard'" name="name"/>
-            <field name="partner_id" ref="res_partner_theshelvehouse0"/>
+            <field name="parent_id" ref="res_partner_theshelvehouse0"/>
             <field name="country_id" ref="base.fr"/>
         </record>
 
 
-        <record id="res_partner_address_brussels0" model="res.partner.address">
+        <record id="res_partner_address_brussels0" model="res.partner">
             <field eval="'Brussels'" name="city"/>
             <field eval="'Leen Vandenloep'" name="name"/>
             <field eval="'Puurs'" name="city"/>
@@ -629,54 +632,54 @@
             <field name="country_id" ref="base.be"/>
             <field eval="'(+32).70.12.85.00'" name="phone"/>
             <field eval="'Schoonmansveld 28'" name="street"/>
-            <field name="partner_id" ref="res_partner_vickingdirect0"/>
+            <field name="parent_id" ref="res_partner_vickingdirect0"/>
             <field name="country_id" ref="base.be"/>
         </record>
 
 
-        <record id="res_partner_address_rogerpecker1" model="res.partner.address">
+        <record id="res_partner_address_rogerpecker1" model="res.partner">
             <field eval="'Kainuu'" name="city"/>
             <field eval="'Roger Pecker'" name="name"/>
-            <field name="partner_id" ref="res_partner_woodywoodpecker0"/>
+            <field name="parent_id" ref="res_partner_woodywoodpecker0"/>
             <field eval="'(+358).9.589 689'" name="phone"/>
             <field name="country_id" ref="base.fi"/>
         </record>
 
 
-        <record id="res_partner_address_geoff1" model="res.partner.address">
+        <record id="res_partner_address_geoff1" model="res.partner">
             <field eval="'Brussels'" name="city"/>
             <field eval="'Geoff'" name="name"/>
-            <field name="partner_id" ref="res_partner_zerooneinc0"/>
+            <field name="parent_id" ref="res_partner_zerooneinc0"/>
             <field name="country_id" ref="base.be"/>
         </record>
 
 
-        <record id="res_partner_address_marcdubois0" model="res.partner.address">
+        <record id="res_partner_address_marcdubois0" model="res.partner">
             <field eval="'Brussels'" name="city"/>
             <field eval="'Marc Dubois'" name="name"/>
             <field eval="'1000'" name="zip"/>
-            <field name="partner_id" ref="res_partner_duboissprl0"/>
+            <field name="parent_id" ref="res_partner_duboissprl0"/>
             <field name="country_id" ref="base.be"/>
             <field eval="'Avenue de la Liberté 56'" name="street"/>
             <field eval="'m.dubois@dubois.be'" name="email"/>
         </record>
 
 
-        <record id="res_partner_address_fabiendupont0" model="res.partner.address">
+        <record id="res_partner_address_fabiendupont0" model="res.partner">
             <field eval="'Namur'" name="city"/>
             <field eval="'Fabien Dupont'" name="name"/>
             <field eval="'5000'" name="zip"/>
-            <field name="partner_id" ref="res_partner_fabiendupont0"/>
+            <!--field name="parent_id" ref="res_partner_fabiendupont0"/-->
             <field name="country_id" ref="base.be"/>
             <field eval="'Blvd Kennedy, 13'" name="street"/>
         </record>
 
 
-        <record id="res_partner_address_ericdubois0" model="res.partner.address">
+        <record id="res_partner_address_ericdubois0" model="res.partner">
             <field eval="'Mons'" name="city"/>
             <field eval="'Eric Dubois'" name="name"/>
             <field eval="'7000'" name="zip"/>
-            <field name="partner_id" ref="res_partner_ericdubois0"/>
+            <!--field name="parent_id" ref="res_partner_ericdubois0"/-->
             <field name="country_id" ref="base.be"/>
             <field eval="'Chaussée de Binche, 27'" name="street"/>
             <field eval="'e.dubois@gmail.com'" name="email"/>
@@ -684,20 +687,20 @@
         </record>
 
 
-        <record id="res_partner_address_notsotinysarl1" model="res.partner.address">
+        <!--record id="res_partner_address_notsotinysarl1" model="res.partner.address">
             <field eval="'Antwerpen'" name="city"/>
             <field eval="'2000'" name="zip"/>
-            <field name="partner_id" ref="res_partner_notsotinysarl0"/>
+            <field name="parent_id" ref="res_partner_notsotinysarl0"/>
             <field name="country_id" ref="base.be"/>
             <field eval="'Antwerpsesteenweg 254'" name="street"/>
             <field eval="'invoice'" name="type"/>
-        </record>
+        </record-->
 
 
-        <record id="res_partner_address_4" model="res.partner.address">
+        <record id="res_partner_address_4" model="res.partner">
             <field eval="'Grand-Rosière'" name="city"/>
             <field eval="'1367'" name="zip"/>
-            <field name="partner_id" ref="res_partner_lucievonck0"/>
+            <field name="parent_id" ref="res_partner_lucievonck0"/>
             <field name="country_id" ref="base.be"/>
             <field eval="'Chaussée de Namur'" name="street"/>
         </record>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 0257bda3acf..1f7b315d957 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -326,12 +326,12 @@
                 <form string="Partners">
                     <group col="8" colspan="4">
                         <group col="2">
-                            <field name="is_company" on_change="onchange_type(is_company, title)"/>
+                            <field name="is_company" on_change="onchange_type(is_company, title)" attrs="{'requierd': True}"/>
                             <field name="function" attrs="{'invisible': [('is_company','=', 'partner')]}" colspan="2"/>
                             <field name="title" size="0" groups="base.group_extended" domain="[('domain', '=', is_company)]"/>
                         </group>
                         <group col="2">
-                            <field name="name"/>
+                            <field name="name" attrs="{'requierd': True}"/>
                             <field name="parent_id" string="Company" attrs="{'invisible': [('is_company','=', 'partner')]}" domain="[('is_company', '=', 'partner')]" context="{'default_is_company': 'partner'}" on_change="onchange_address(use_parent_address, parent_id)"/>
                         </group>
                         <group col="2">