diff --git a/bin/addons/base/res/partner/partner_demo.xml b/bin/addons/base/res/partner/partner_demo.xml
index e966a5308ce..6f433675767 100644
--- a/bin/addons/base/res/partner/partner_demo.xml
+++ b/bin/addons/base/res/partner/partner_demo.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data noupdate="1">
         <!--
-		Resource: res.partner.category
-		-->
+        Resource: res.partner.category
+        -->
 
         <record id="res_partner_category_0" model="res.partner.category">
             <field name="name">Customer</field>
@@ -62,8 +62,31 @@
 
 
         <!--
-		Resource: res.partner
-		-->
+        Resource: res.partner.category for training
+        -->
+    <record id="res_partner_category_consumers0" model="res.partner.category">
+        <field name="name">Consumers</field>
+            <field name="parent_id" ref="res_partner_category_0"/>
+    </record>    
+    <record id="res_partner_category_retailers0" model="res.partner.category">
+        <field name="name">Retailers</field>
+            <field name="parent_id" ref="res_partner_category_0"/>
+    </record>
+
+    <record id="res_partner_category_miscellaneoussuppliers0" model="res.partner.category">
+          <field name="name">Miscellaneous Suppliers</field>
+            <field name="parent_id" ref="res_partner_category_8"/>
+    </record>
+
+
+    <record id="res_partner_category_woodsuppliers0" model="res.partner.category">
+        <field name="name">Wood Suppliers</field>
+            <field name="parent_id" ref="res_partner_category_8"/>
+    </record>
+
+       <!--
+        Resource: res.partner
+        -->
 
         <record id="res_partner_asus" model="res.partner">
             <field name="name">ASUStek</field>
@@ -179,9 +202,57 @@
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
         </record>
 
+    <!--
+        Resource: res.partner for training
+        -->
+
+        <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 model="res.users" name="user_id" search="[('name', '=', u'Thomas Lebrun')]"/>
+            <field name="name">Dubois sprl</field>
+        </record>
+
+        <record id="res_partner_ericdubois0" model="res.partner">
+            <field name="name">Eric Dubois</field>
+        </record>
+
+        <record id="res_partner_fabiendupont0" model="res.partner">
+            <field name="name">Fabien Dupont</field>
+        </record>
+
+        <record id="res_partner_lucievonck0" model="res.partner">
+            <field name="name">Lucie Vonck</field>
+        </record>
+
+        <record id="res_partner_notsotinysarl0" model="res.partner">
+            <field name="name">NotSoTiny SARL</field>
+        </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"/>
+        </record>
+
+        <record id="res_partner_vickingdirect0" model="res.partner">
+            <field name="name">Vicking Direct</field>
+            <field eval="[(6,0,[ref('res_partner_category_miscellaneoussuppliers0')])]" name="category_id"/>
+                        <field name="supplier">1</field>
+        </record>
+
+        <record id="res_partner_woodywoodpecker0" model="res.partner">
+            <field name="name">Wood y Wood Pecker</field>
+            <field eval="[(6,0,[ref('res_partner_category_woodsuppliers0')])]" name="category_id"/>
+                        <field name="supplier">1</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"/>
+        </record>
+
         <!--
-		Resource: res.partner.address
-		-->
+        Resource: res.partner.address
+        -->
 
         <record id="res_partner_address_1" model="res.partner.address">
             <field name="city">Bruxelles</field>
@@ -359,14 +430,143 @@
             <field name="partner_id" ref="res_partner_accent"/>
         </record>
 
-		<!--
-		Resource: res.request
-		-->
+        <!--
+        Resource: res.partner.address for Training
+        -->
+
+        <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="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"/>
+            <field eval="'default'" name="type"/>
+        </record>
+
+
+        <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.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.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.address">
+            <field eval="'Brussels'" name="city"/>
+            <field name="country_id" ref="base.be"/>
+        </record>
+
+
+        <record id="res_partner_address_henrychard1" model="res.partner.address">
+            <field eval="'Paris'" name="city"/>
+            <field eval="'Henry Chard'" name="name"/>
+            <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.address">
+            <field eval="'Brussels'" name="city"/>
+            <field eval="'Brussels'" name="name"/>
+            <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.address">
+            <field eval="'Kainuu'" name="city"/>
+            <field eval="'Roger Pecker'" name="name"/>
+            <field name="partner_id" ref="res_partner_woodywoodpecker0"/>
+            <field name="country_id" ref="base.fi"/>
+        </record>
+
+
+        <record id="res_partner_address_geoff1" model="res.partner.address">
+            <field eval="'Brussels'" name="city"/>
+            <field eval="'Geoff'" name="name"/>
+            <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.address">
+            <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="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">
+            <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="country_id" ref="base.be"/>
+            <field eval="'Blvd Kennedy, 13'" name="street"/>
+        </record>
+
+
+        <record id="res_partner_address_1" model="res.partner.address">
+            <field name="partner_id" ref="res_partner_fabiendupont0"/>
+        </record>
+
+
+        <record id="res_partner_address_2" model="res.partner.address">
+            <field eval="'Mons'" name="city"/>
+            <field eval="'7000'" name="zip"/>
+            <field name="partner_id" ref="res_partner_ericdubois0"/>
+            <field name="country_id" ref="base.be"/>
+            <field eval="'Chaussée de Binche, 27'" name="street"/>
+        </record>
+
+
+        <record id="res_partner_address_3" model="res.partner.address">
+            <field eval="'Antwerpen'" name="city"/>
+            <field eval="'2000'" name="zip"/>
+            <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.address">
+            <field eval="'Grand-Rosière'" name="city"/>
+            <field eval="'1367'" name="zip"/>
+            <field name="partner_id" ref="res_partner_lucievonck0"/>
+            <field name="country_id" ref="base.be"/>
+            <field eval="'Chaussée de Namur'" name="street"/>
+        </record>
+
+
+        <!--
+        Resource: res.request
+        -->
 
         <record id="res_partner_asustek_request" model="res.request">
-        	<field name="name">ASUSTEK-Subject</field>
-        	<field name="act_to" ref="user_demo"/>
-			<field name="ref_doc1" ref="res_partner_asus"/>
+            <field name="name">ASUSTEK-Subject</field>
+            <field name="act_to" ref="user_demo"/>
+            <field name="ref_doc1" ref="res_partner_asus"/>
         </record>
     </data>
 </openerp>