diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 70ade7133a9..525c7e2e334 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1058,15 +1058,15 @@
         <record id="main_partner" model="res.partner">
             <field name="name">Your Company</field>
             <!-- Address and Company ID will be set later -->
-            <!--field name="address" eval="[]"/-->
+            <field name="address" eval="[]"/>
             <field name="company_id" eval="None"/>
             <field name="customer" eval="False"/>
         </record>
-        <!--record id="main_address" model="res.partner.address">
+        <record id="main_address" model="res.partner.address">
             <field name="partner_id" ref="main_partner"/>
             <field name="type">default</field>
             <field name="company_id" eval="None"/>
-        </record-->
+        </record>
 
         <!-- Currencies -->
         <record id="EUR" model="res.currency">
@@ -1102,9 +1102,9 @@
         <record id="main_partner" model="res.partner">
             <field name="company_id" ref="main_company"/>
         </record>
-        <!--record id="main_address" model="res.partner.address">
+        <record id="main_address" model="res.partner.address">
             <field name="company_id" ref="main_company"/>
-        </record-->
+        </record>
         <record id="EUR" model="res.currency">
             <field name="company_id" ref="main_company"/>
         </record>
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 872910aaf95..cef9ead8cf1 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -332,5 +332,35 @@ class res_partner(osv.osv):
 
 res_partner()
 
+# Deprecated  this feature
+class res_partner_address(osv.osv):
+    _table = "res_partner"
+    _name = 'res.partner.address'
+    _order = 'type, name'
+    _columns = {
+        'partner_id': fields.many2one('res.partner', 'Partner Name', ondelete='set null', select=True, help="Keep empty for a private address, not related to partner."),
+        'type': fields.selection( [ ('default','Default'),('invoice','Invoice'), ('delivery','Delivery'), ('contact','Contact'), ('other','Other') ],'Address Type', help="Used to select automatically the right address according to the context in sales and purchases documents."),
+        'function': fields.char('Function', size=128),
+        'title': fields.many2one('res.partner.title','Title'),
+        'name': fields.char('Contact Name', size=64, select=1),
+        'street': fields.char('Street', size=128),
+        'street2': fields.char('Street2', size=128),
+        'zip': fields.char('Zip', change_default=True, size=24),
+        'city': fields.char('City', size=128),
+        'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
+        'country_id': fields.many2one('res.country', 'Country'),
+        'email': fields.char('E-Mail', size=240),
+        'phone': fields.char('Phone', size=64),
+        'fax': fields.char('Fax', size=64),
+        'mobile': fields.char('Mobile', size=64),
+        'birthdate': fields.char('Birthdate', size=64),
+        'is_customer_add': fields.related('partner_id', 'customer', type='boolean', string='Customer'),
+        'is_supplier_add': fields.related('partner_id', 'supplier', type='boolean', string='Supplier'),
+        'active': fields.boolean('Active', help="Uncheck the active field to hide the contact."),
+#        'company_id': fields.related('partner_id','company_id',type='many2one',relation='res.company',string='Company', store=True),
+        'company_id': fields.many2one('res.company', 'Company',select=1),
+        'color': fields.integer('Color Index'),
+    }
+res_partner_address()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 017abc13e79..d38a6a68511 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -93,139 +93,137 @@
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="is_company">partner</field>
+            <field name="address" eval="[]"/>
             <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="is_company">partner</field>
+            <field name="address" eval="[]"/>
             <field name="website">www.agrolait.com</field>
         </record>
         <record id="res_partner_c2c" model="res.partner">
             <field name="name">Camptocamp</field>
             <field eval="[(6, 0, [ref('res_partner_category_10'), ref('res_partner_category_5')])]" name="category_id"/>
-            <field name="is_company">partner</field>
             <field name="supplier">1</field>
+            <field name="address" eval="[]"/>
             <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 name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_5')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </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 name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
             <field name="supplier">1</field>
+            <field name="address" eval="[]"/>
             <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="is_company">partner</field>
+            <field name="address" eval="[]"/>
             <field name="website">www.wealthyandsons.com/</field>
         </record>
         <record id="res_partner_3" model="res.partner">
             <field name="name">China Export</field>
-            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
             <field name="website">www.chinaexport.com/</field>
         </record>
         <record id="res_partner_4" model="res.partner">
             <field name="name">Distrib PC</field>
-            <field name="is_company">partner</field>
             <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="website">www.distribpc.com/</field>
         </record>
         <record id="res_partner_5" model="res.partner">
             <field name="name">Ecole de Commerce de Liege</field>
-            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
             <field name="website">www.eci-liege.info//</field>
         </record>
         <record id="res_partner_6" model="res.partner">
             <field name="name">Elec Import</field>
-            <field name="is_company">partner</field>
             <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="[]"/>
         </record>
         <record id="res_partner_maxtor" model="res.partner">
             <field name="name">Maxtor</field>
-            <field name="is_company">partner</field>
             <field eval="32000.00" name="credit_limit"/>
             <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="[]"/>
         </record>
         <record id="res_partner_seagate" model="res.partner">
             <field name="name">Seagate</field>
-            <field name="is_company">partner</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="[]"/>
         </record>
         <record id="res_partner_8" model="res.partner">
             <field name="website">http://mediapole.net</field>
             <field name="name">Mediapole SPRL</field>
-            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_9" model="res.partner">
             <field name="website">www.balmerinc.com</field>
             <field name="name">BalmerInc S.A.</field>
-            <field name="is_company">partner</field>
             <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="[]"/>
         </record>
         <record id="res_partner_10" model="res.partner">
             <field name="name">Tecsas</field>
-            <field name="is_company">partner</field>
             <field name="ean13">3020170000003</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_11" model="res.partner">
             <field name="name">Leclerc</field>
-            <field name="is_company">partner</field>
             <field eval="1200.00" name="credit_limit"/>
             <field eval="[(6, 0, [ref('res_partner_category_0')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_14" model="res.partner">
             <field name="name">Centrale d'achats BML</field>
-            <field name="is_company">partner</field>
             <field name="ean13">3020178572427</field>
             <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="[]"/>
         </record>
         <record id="res_partner_15" model="res.partner">
             <field name="name">Magazin BML 1</field>
-            <field name="is_company">partner</field>
             <field name="ean13">3020178570171</field>
             <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="[]"/>
         </record>
         <record id="res_partner_accent" model="res.partner">
             <field name="name">Université de Liège</field>
-            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
             <field name="website">http://www.ulg.ac.be/</field>
         </record>
 
@@ -236,55 +234,59 @@
         <record id="res_partner_duboissprl0" model="res.partner">
             <field eval="'Sprl Dubois would like to sell our bookshelves but they have no storage location, so it would be exclusively on order'" name="comment"/>
             <field name="name">Dubois sprl</field>
-            <field name="is_company">partner</field>
+            <field name="address" eval="[]"/>
             <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>
-        </record-->
+            <field name="address" eval="[]"/>
+        </record>
 
-        <!--record id="res_partner_fabiendupont0" model="res.partner">
+        <record id="res_partner_fabiendupont0" model="res.partner">
             <field name="name">Fabien Dupont</field>
-        </record-->
+            <field name="address" eval="[]"/>
+        </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 name="is_company">partner</field>
             <field eval="[(6,0,[ref('res_partner_category_retailers0')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
 
         <record id="res_partner_vickingdirect0" model="res.partner">
             <field name="name">Vicking Direct</field>
-            <field name="is_company">partner</field>
             <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="website">vicking-direct.be</field>
         </record>
 
         <record id="res_partner_woodywoodpecker0" model="res.partner">
             <field name="name">Wood y Wood Pecker</field>
-            <field name="is_company">partner</field>
             <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="website">woodywoodpecker.com</field>
         </record>
 
         <record id="res_partner_zerooneinc0" model="res.partner">
             <field name="name">ZeroOne Inc</field>
-            <field name="is_company">partner</field>
             <field eval="[(6,0,[ref('res_partner_category_consumers0')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
             <field name="website">http://www.zerooneinc.com/</field>
         </record>
 
@@ -292,7 +294,7 @@
         Resource: res.partner.address
         -->
 
-        <record id="res_partner_address_1" model="res.partner">
+        <record id="res_partner_address_1" model="res.partner.address">
             <field name="city">Bruxelles</field>
             <field name="name">Michel Schumacher</field>
             <field name="zip">1000</field>
@@ -301,9 +303,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="parent_id" ref="res_partner_9"/>
+            <field name="partner_id" ref="res_partner_9"/>
         </record>
-        <record id="res_partner_address_2" model="res.partner">
+        <record id="res_partner_address_2" model="res.partner.address">
             <field name="city">Avignon CEDEX 09</field>
             <field name="name">Laurent Jacot</field>
             <field name="zip">84911</field>
@@ -312,9 +314,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="parent_id" ref="res_partner_10"/>
+            <field name="partner_id" ref="res_partner_10"/>
         </record>
-        <record id="res_partner_address_3000" model="res.partner">
+        <record id="res_partner_address_3000" model="res.partner.address">
             <field name="city">Champs sur Marne</field>
             <field name="name">Laith Jubair</field>
             <field name="zip">77420</field>
@@ -323,18 +325,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="parent_id" ref="res_partner_desertic_hispafuentes"/>
+            <field name="partner_id" ref="res_partner_desertic_hispafuentes"/>
         </record>
-        <record id="res_partner_address_3" model="res.partner">
+        <record id="res_partner_address_3" model="res.partner.address">
             <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="parent_id" ref="res_partner_8"/>
+            <field name="partner_id" ref="res_partner_8"/>
         </record>
-        <record id="res_partner_address_tang" model="res.partner">
+        <record id="res_partner_address_tang" model="res.partner.address">
             <field name="city">Taiwan</field>
             <field name="name">Tang</field>
             <field name="zip">23410</field>
@@ -343,9 +345,9 @@
             <field name="email">info@asustek.com</field>
             <field name="phone">+ 1 64 61 04 01</field>
             <field name="type">default</field>
-            <field name="parent_id" ref="res_partner_asus"/>
+            <field name="partner_id" ref="res_partner_asus"/>
         </record>
-        <record id="res_partner_address_wong" model="res.partner">
+        <record id="res_partner_address_wong" model="res.partner.address">
             <field name="city">Hong Kong</field>
             <field name="name">Wong</field>
             <field name="zip">23540</field>
@@ -354,9 +356,9 @@
             <field name="email">info@maxtor.com</field>
             <field name="phone">+ 11 8528 456 789</field>
             <field name="type">default</field>
-            <field name="parent_id" ref="res_partner_maxtor"/>
+            <field name="partner_id" ref="res_partner_maxtor"/>
         </record>
-        <record id="res_partner_address_6" model="res.partner">
+        <record id="res_partner_address_6" model="res.partner.address">
             <field name="city">Brussels</field>
             <field name="name">Etienne Lacarte</field>
             <field name="zip">2365</field>
@@ -365,9 +367,9 @@
             <field name="type">default</field>
             <field name="email">info@elecimport.com</field>
             <field name="phone">+ 32 025 897 456</field>
-            <field name="parent_id" ref="res_partner_6"/>
+            <field name="partner_id" ref="res_partner_6"/>
         </record>
-        <record id="res_partner_address_7" model="res.partner">
+        <record id="res_partner_address_7" model="res.partner.address">
             <field name="city">Namur</field>
             <field name="name">Jean Guy Lavente</field>
             <field name="zip">2541</field>
@@ -376,9 +378,9 @@
             <field name="type">default</field>
             <field name="email">info@distribpc.com</field>
             <field name="phone">+ 32 081256987</field>
-            <field name="parent_id" ref="res_partner_4"/>
+            <field name="partner_id" ref="res_partner_4"/>
         </record>
-        <record id="res_partner_address_8" model="res.partner">
+        <record id="res_partner_address_8" model="res.partner.address">
             <field name="city">Wavre</field>
             <field name="name">Sylvie Lelitre</field>
             <field name="zip">5478</field>
@@ -387,10 +389,10 @@
             <field name="type">default</field>
 	    <field name="email">s.l@agrolait.be</field>
 	    <field name="phone">003281588558</field>
-            <field name="parent_id" ref="res_partner_agrolait"/>
+            <field name="partner_id" ref="res_partner_agrolait"/>
             <field name="title" ref="base.res_partner_title_madam"/>
         </record>
-        <record id="res_partner_address_8delivery" model="res.partner">
+        <record id="res_partner_address_8delivery" model="res.partner.address">
             <field name="city">Wavre</field>
             <field name="name">Paul Lelitre</field>
             <field name="zip">5478</field>
@@ -399,10 +401,10 @@
             <field name="type">delivery</field>
 	    <field name="email">p.l@agrolait.be</field>
 	    <field name="phone">003281588557</field>
-            <field name="parent_id" ref="res_partner_agrolait"/>
+            <field name="partner_id" ref="res_partner_agrolait"/>
             <field name="title" ref="base.res_partner_title_sir"/>
         </record>
-        <record id="res_partner_address_8invoice" model="res.partner">
+        <record id="res_partner_address_8invoice" model="res.partner.address">
             <field name="city">Wavre</field>
             <field name="name">Serge Lelitre</field>
             <field name="zip">5478</field>
@@ -411,10 +413,10 @@
             <field name="type">invoice</field>
 	    <field name="email">serge.l@agrolait.be</field>
 	    <field name="phone">003281588556</field>
-            <field name="parent_id" ref="res_partner_agrolait"/>
+            <field name="partner_id" ref="res_partner_agrolait"/>
             <field name="title" ref="base.res_partner_title_sir"/>
         </record>
-        <record id="res_partner_address_9" model="res.partner">
+        <record id="res_partner_address_9" model="res.partner.address">
             <field name="city">Paris</field>
             <field name="name">Arthur Grosbonnet</field>
             <field name="zip">75016</field>
@@ -423,10 +425,10 @@
             <field name="type">default</field>
 	    <field name="email">a.g@wealthyandsons.com</field>
 	    <field name="phone">003368978776</field>
-            <field name="parent_id" ref="res_partner_2"/>
+            <field name="partner_id" ref="res_partner_2"/>
             <field name="title" ref="base.res_partner_title_sir"/>
         </record>
-        <record id="res_partner_address_11" model="res.partner">
+        <record id="res_partner_address_11" model="res.partner.address">
             <field name="city">Alencon</field>
             <field name="name">Sebastien LANGE</field>
             <field name="zip">61000</field>
@@ -435,9 +437,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="parent_id" ref="res_partner_sednacom"/>
+            <field name="partner_id" ref="res_partner_sednacom"/>
         </record>
-        <record id="res_partner_address_10" model="res.partner">
+        <record id="res_partner_address_10" model="res.partner.address">
             <field name="city">Liege</field>
             <field name="name">Karine Lesbrouffe</field>
             <field name="zip">6985</field>
@@ -446,9 +448,9 @@
 	    <field name="email">k.lesbrouffe@eci-liege.info</field>
 	    <field name="phone">+32 421 52571</field>
             <field name="type">default</field>
-            <field name="parent_id" ref="res_partner_5"/>
+            <field name="partner_id" ref="res_partner_5"/>
         </record>
-        <record id="res_partner_address_zen" model="res.partner">
+        <record id="res_partner_address_zen" model="res.partner.address">
             <field name="city">Shanghai</field>
             <field name="name">Zen</field>
             <field name="zip">478552</field>
@@ -457,9 +459,9 @@
             <field name="type">default</field>
 	    <field name="email">zen@chinaexport.com</field>
 	    <field name="phone">+86-751-64845671</field>
-            <field name="parent_id" ref="res_partner_3"/>
+            <field name="partner_id" ref="res_partner_3"/>
         </record>
-        <record id="res_partner_address_12" model="res.partner">
+        <record id="res_partner_address_12" model="res.partner.address">
             <field name="type">default</field>
   	    <field name="city">Grenoble</field>
             <field name="name">Loïc Dupont</field>
@@ -469,9 +471,9 @@
             <field name="type">default</field>
 	    <field name="email">l.dupont@tecsas.fr</field>
 	    <field name="phone">+33-658-256545</field>
-            <field name="parent_id" ref="res_partner_10"/>
+            <field name="partner_id" ref="res_partner_10"/>
         </record>
-        <record id="res_partner_address_13" model="res.partner">
+        <record id="res_partner_address_13" model="res.partner.address">
             <field name="type">default</field>
             <field name="name">Carl François</field>
 	    <field name="city">Bruxelles</field>
@@ -480,9 +482,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="parent_id" ref="res_partner_14"/>
+            <field name="partner_id" ref="res_partner_14"/>
         </record>
-        <record id="res_partner_address_14" model="res.partner">
+        <record id="res_partner_address_14" model="res.partner.address">
             <field name="type">default</field>
             <field name="name">Lucien Ferguson</field>
             <field name="street">89 Chaussée de Liège</field>
@@ -490,9 +492,9 @@
             <field name="zip">5000</field>
 	    <field name="email">lucien.ferguson@bml.be</field>
 	    <field name="phone">+32-621-568978</field>
-            <field name="parent_id" ref="res_partner_15"/>
+            <field name="partner_id" ref="res_partner_15"/>
         </record>
-        <record id="res_partner_address_15" model="res.partner">
+        <record id="res_partner_address_15" model="res.partner.address">
             <field name="type">default</field>
             <field name="name">Marine Leclerc</field>
             <field name="street">rue Grande</field>
@@ -500,9 +502,9 @@
             <field name="zip">29200</field>
 	    <field name="email">marine@leclerc.fr</field>
 	    <field name="phone">+33-298.334558</field>
-            <field name="parent_id" ref="res_partner_11"/>
+            <field name="partner_id" ref="res_partner_11"/>
         </record>
-        <record id="res_partner_address_16" model="res.partner">
+        <record id="res_partner_address_16" model="res.partner.address">
             <field name="type">invoice</field>
             <field name="name">Claude Leclerc</field>
             <field name="street">rue Grande</field>
@@ -510,10 +512,10 @@
             <field name="zip">29200</field>
 	    <field name="email">claude@leclerc.fr</field>
 	    <field name="phone">+33-298.334598</field>
-            <field name="parent_id" ref="res_partner_11"/>
+            <field name="partner_id" ref="res_partner_11"/>
         </record>
 
-        <record id="res_partner_address_accent" model="res.partner">
+        <record id="res_partner_address_accent" model="res.partner.address">
             <field name="type">default</field>
             <field name="name">Martine Ohio</field>
             <field name="street">Place du 20Août</field>
@@ -521,9 +523,9 @@
             <field name="zip">4000</field>
 	    <field name="email">martine.ohio@ulg.ac.be</field>
 	    <field name="phone">+32-45895245</field>
-            <field name="parent_id" ref="res_partner_accent"/>
+            <field name="partner_id" ref="res_partner_accent"/>
         </record>
-        <record id="res_partner_address_Camptocamp" model="res.partner">
+        <record id="res_partner_address_Camptocamp" model="res.partner.address">
             <field name="city">Lausanne</field>
             <field name="name">Luc Maurer</field>
             <field name="zip">1015</field>
@@ -531,9 +533,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="parent_id" ref="res_partner_c2c"/>
+            <field name="partner_id" ref="res_partner_c2c"/>
         </record>
-        <record id="res_partner_address_seagate" model="res.partner">
+        <record id="res_partner_address_seagate" model="res.partner.address">
             <field name="city">Cupertino</field>
             <field name="name">Seagate Technology</field>
             <field name="zip">95014</field>
@@ -542,9 +544,9 @@
             <field name="email">info@seagate.com</field>
             <field name="phone">+1 408 256987</field>
             <field name="type">default</field>
-            <field name="parent_id" ref="res_partner_seagate"/>
+            <field name="partner_id" ref="res_partner_seagate"/>
         </record>
-        <record id="res_partner_address_thymbra" model="res.partner">
+        <record id="res_partner_address_thymbra" model="res.partner.address">
             <field name="city">Buenos Aires</field>
             <field name="name">Jack Daniels</field>
             <field name="zip">1659</field>
@@ -554,9 +556,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="parent_id" ref="res_partner_thymbra"/>
+            <field name="partner_id" ref="res_partner_thymbra"/>
         </record>
-        <record id="res_partner_address_tinyatwork" model="res.partner">
+        <record id="res_partner_address_tinyatwork" model="res.partner.address">
             <field name="city">Boston</field>
             <field name="name">Tiny Work</field>
             <field name="zip">5501</field>
@@ -565,18 +567,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="parent_id" ref="res_partner_tinyatwork"/>
+            <field name="partner_id" ref="res_partner_tinyatwork"/>
         </record>
 
         <!--
         Resource: res.partner.address for Training
         -->
 
-        <record id="res_partner_address_notsotinysarl0" model="res.partner">
+        <record id="res_partner_address_notsotinysarl0" model="res.partner.address">
             <field eval="'Namur'" name="city"/>
             <field eval="'NotSoTiny SARL'" name="name"/>
             <field eval="'5000'" name="zip"/>
-            <!--field name="parent_id" ref="res_partner_notsotinysarl0"/-->
+            <field name="partner_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"/>
@@ -584,42 +586,42 @@
         </record>
 
 
-        <record id="res_partner_address_henrychard0" model="res.partner">
+        <record id="res_partner_address_henrychard0" model="res.partner.address">
             <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">
+        <record id="res_partner_address_geoff0" model="res.partner.address">
             <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">
+        <record id="res_partner_address_rogerpecker0" model="res.partner.address">
             <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">
+        <record id="res_partner_address_0" model="res.partner.address">
             <field eval="'Brussels'" name="city"/>
             <field name="country_id" ref="base.be"/>
-        </record-->
+        </record>
 
 
-        <record id="res_partner_address_henrychard1" model="res.partner">
+        <record id="res_partner_address_henrychard1" model="res.partner.address">
             <field eval="'Paris'" name="city"/>
             <field eval="'Henry Chard'" name="name"/>
-            <field name="parent_id" ref="res_partner_theshelvehouse0"/>
+            <field name="partner_id" ref="res_partner_theshelvehouse0"/>
             <field name="country_id" ref="base.fr"/>
         </record>
 
 
-        <record id="res_partner_address_brussels0" model="res.partner">
+        <record id="res_partner_address_brussels0" model="res.partner.address">
             <field eval="'Brussels'" name="city"/>
             <field eval="'Leen Vandenloep'" name="name"/>
             <field eval="'Puurs'" name="city"/>
@@ -627,54 +629,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="parent_id" ref="res_partner_vickingdirect0"/>
+            <field name="partner_id" ref="res_partner_vickingdirect0"/>
             <field name="country_id" ref="base.be"/>
         </record>
 
 
-        <record id="res_partner_address_rogerpecker1" model="res.partner">
+        <record id="res_partner_address_rogerpecker1" model="res.partner.address">
             <field eval="'Kainuu'" name="city"/>
             <field eval="'Roger Pecker'" name="name"/>
-            <field name="parent_id" ref="res_partner_woodywoodpecker0"/>
+            <field name="partner_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">
+        <record id="res_partner_address_geoff1" model="res.partner.address">
             <field eval="'Brussels'" name="city"/>
             <field eval="'Geoff'" name="name"/>
-            <field name="parent_id" ref="res_partner_zerooneinc0"/>
+            <field name="partner_id" ref="res_partner_zerooneinc0"/>
             <field name="country_id" ref="base.be"/>
         </record>
 
 
-        <record id="res_partner_address_marcdubois0" model="res.partner">
+        <record id="res_partner_address_marcdubois0" model="res.partner.address">
             <field eval="'Brussels'" name="city"/>
             <field eval="'Marc Dubois'" name="name"/>
             <field eval="'1000'" name="zip"/>
-            <field name="parent_id" ref="res_partner_duboissprl0"/>
+            <field name="partner_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">
+        <record id="res_partner_address_fabiendupont0" model="res.partner.address">
             <field eval="'Namur'" name="city"/>
             <field eval="'Fabien Dupont'" name="name"/>
             <field eval="'5000'" name="zip"/>
-            <!--field name="parent_id" ref="res_partner_fabiendupont0"/-->
+            <field name="partner_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">
+        <record id="res_partner_address_ericdubois0" model="res.partner.address">
             <field eval="'Mons'" name="city"/>
             <field eval="'Eric Dubois'" name="name"/>
             <field eval="'7000'" name="zip"/>
-            <!--field name="parent_id" ref="res_partner_ericdubois0"/-->
+            <field name="partner_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"/>
@@ -682,23 +684,23 @@
         </record>
 
 
-        <!--record id="res_partner_address_notsotinysarl1" model="res.partner">
+        <record id="res_partner_address_notsotinysarl1" model="res.partner.address">
             <field eval="'Antwerpen'" name="city"/>
             <field eval="'2000'" name="zip"/>
-            <field name="parent_id" ref="res_partner_notsotinysarl0"/>
+            <field name="partner_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 id="res_partner_address_4" model="res.partner">
+        <record id="res_partner_address_4" model="res.partner.address">
             <field eval="'Grand-Rosière'" name="city"/>
             <field eval="'1367'" name="zip"/>
-            <field name="parent_id" ref="res_partner_lucievonck0"/>
+            <field name="partner_id" ref="res_partner_lucievonck0"/>
             <field name="country_id" ref="base.be"/>
             <field eval="'Chaussée de Namur'" name="street"/>
-        </record-->
+        </record>
 
 
         <!--