diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 17f5e6e4547..3ce5dddabde 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
         <!--
         Resource: res.partner.category
         -->
@@ -69,6 +69,27 @@
             <field name="name">Retailers</field>
             <field name="parent_id" ref="res_partner_category_1"/>
         </record>
+        <record id="res_partner_category_17" model="res.partner.category">
+            <field name="name">Company Contact</field>
+        </record>
+        <record id="res_partner_category_18" model="res.partner.category">
+            <field name="name">Manufacturer</field>
+        </record>
+        <record id="res_partner_category_19" model="res.partner.category">
+            <field name="name">Technician</field>
+        </record>
+        <record id="res_partner_category_20" model="res.partner.category">
+            <field name="name">Mechanic</field>
+        </record>
+        <record id="res_partner_category_21" model="res.partner.category">
+            <field name="name">Engineer</field>
+        </record>
+        <record id="res_partner_category_22" model="res.partner.category">
+            <field name="name">Specialist</field>
+        </record>
+        <record id="res_partner_category_23" model="res.partner.category">
+            <field name="name">Contractor</field>
+        </record>
 
 
        <!--
@@ -388,42 +409,53 @@
             <field name="name">Mark Davis</field>
             <field name="parent_id" ref="main_partner"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Chief Executive Officer (CEO)</field>
         </record>
 
         <record id="res_partner_main2" model="res.partner">
             <field name="name">Roger Scott</field>
             <field name="parent_id" ref="main_partner"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Chief Operations Officer (COO)</field>
         </record>
 
         <record id="res_partner_address_1" model="res.partner">
             <field name="name">Tang Tsui</field>
             <field name="parent_id" ref="res_partner_1"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Service Manager</field>
+            <field eval="[(6, 0, [ref('res_partner_category_17')])]" name="category_id"/>
         </record>
 
         <record id="res_partner_address_2" model="res.partner">
             <field name="name">Joseph Walters</field>
             <field name="parent_id" ref="res_partner_1"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Store Manager</field>
+            <field eval="[(6, 0, [ref('res_partner_category_21')])]" name="category_id"/>
         </record>
 
         <record id="res_partner_address_3" model="res.partner">
             <field name="name">Thomas Passot</field>
             <field name="parent_id" ref="res_partner_2"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Functional Consultant</field>
+            <field eval="[(6, 0, [ref('res_partner_category_22')])]" name="category_id"/>
         </record>
 
         <record id="res_partner_address_4" model="res.partner">
             <field name="name">Michel Fletcher</field>
             <field name="parent_id" ref="res_partner_2"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Analyst</field>
         </record>
 
         <record id="res_partner_address_5" model="res.partner">
             <field name="name">Chao Wang</field>
             <field name="parent_id" ref="res_partner_3"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Marketing Manager</field>
+            <field eval="[(6, 0, [ref('res_partner_category_23')])]" name="category_id"/>
         </record>
 
         <record id="res_partner_address_6" model="res.partner">
@@ -431,37 +463,42 @@
             <field name="parent_id" ref="res_partner_3"/>
             <field model="res.partner.title" name="title" search="[('name','ilike','miss')]"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Supervisor</field>
         </record>
 
         <record id="res_partner_address_7" model="res.partner">
             <field name="name">Richard Ellis</field>
             <field name="parent_id" ref="res_partner_4"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Production Supervisor</field>
         </record>
 
         <record id="res_partner_address_8" model="res.partner">
             <field name="name">Paul Williams</field>
             <field name="parent_id" ref="res_partner_4"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Line Mechanic</field>
         </record>
-       
+
         <record id="res_partner_address_9" model="res.partner">
             <field name="name">Brian Williams</field>
             <field name="parent_id" ref="res_partner_4"/>
             <field name="use_parent_address" eval="1"/>
-            <field name="title" ref="base.res_partner_title_sir"/>
+            <field name="function">Computer Technician</field>
         </record>
 
         <record id="res_partner_address_10" model="res.partner">
             <field name="name">David Simpson</field>
             <field name="parent_id" ref="res_partner_5"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Senior Consultant</field>
         </record>
 
         <record id="res_partner_address_11" model="res.partner">
             <field name="name">John M. Brown</field>
             <field name="parent_id" ref="res_partner_5"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Director</field>
         </record>
 
         <record id="res_partner_address_12" model="res.partner">
@@ -469,18 +506,22 @@
             <field name="name">James Miller</field>
             <field name="parent_id" ref="res_partner_6"/>
             <field name="use_parent_address" eval="1"/>
+            <field eval="[(6, 0, [ref('res_partner_category_17')])]" name="category_id"/>
+            <field name="function">Electrical Supervisor</field>
         </record>
 
         <record id="res_partner_address_13" model="res.partner">
             <field name="name">Charlie Bernard</field>
             <field name="parent_id" ref="res_partner_7"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Senior Associate</field>
         </record>
 
         <record id="res_partner_address_14" model="res.partner">
             <field name="name">Jessica Dupont</field>
             <field name="parent_id" ref="res_partner_7"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Analyst</field>
         </record>
 
         <record id="res_partner_address_15" model="res.partner">
@@ -488,6 +529,8 @@
             <field name="name">Phillipp Miller</field>
             <field name="parent_id" ref="res_partner_8"/>
             <field name="use_parent_address" eval="1"/>
+            <field eval="[(6, 0, [ref('res_partner_category_17')])]" name="category_id"/>
+            <field name="function">Creative Director</field>
         </record>
 
         <record id="res_partner_address_16" model="res.partner">
@@ -495,18 +538,23 @@
             <field name="name">Ayaan Agarwal</field>
             <field name="parent_id" ref="res_partner_9"/>
             <field name="use_parent_address" eval="1"/>
+            <field eval="[(6, 0, [ref('res_partner_category_17')])]" name="category_id"/>
+            <field name="function">Director</field>
         </record>
 
         <record id="res_partner_address_17" model="res.partner">
             <field name="name">Daniel Jackson</field>
             <field name="parent_id" ref="res_partner_10"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Managing Partner</field>
         </record>
 
         <record id="res_partner_address_18" model="res.partner">
             <field name="name">William Thomas</field>
             <field name="parent_id" ref="res_partner_10"/>
             <field name="use_parent_address" eval="1"/>
+            <field eval="[(6, 0, [ref('res_partner_category_22')])]" name="category_id"/>
+            <field name="function">Senior Consultant</field>
         </record>
 
         <record id="res_partner_address_19" model="res.partner">
@@ -514,102 +562,123 @@
             <field name="name">Sergio Pérez</field>
             <field name="parent_id" ref="res_partner_11"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Accountant</field>
         </record>
 
         <record id="res_partner_address_20" model="res.partner">
             <field name="name">Laura Castro</field>
             <field name="parent_id" ref="res_partner_11"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Goods Supervisor</field>
         </record>
 
         <record id="res_partner_address_21" model="res.partner">
             <field name="name">Luc Maurer</field>
             <field name="parent_id" ref="res_partner_12"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Director</field>
         </record>
 
         <record id="res_partner_address_22" model="res.partner">
             <field name="name">Laith Jubair</field>
             <field name="parent_id" ref="res_partner_13"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Director</field>
         </record>
 
         <record id="res_partner_address_23" model="res.partner">
             <field name="name">Angel Cook</field>
             <field name="parent_id" ref="res_partner_14"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">General Manager</field>
         </record>
 
         <record id="res_partner_address_24" model="res.partner">
             <field name="name">Robert Anderson</field>
             <field name="parent_id" ref="res_partner_14"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">System Analyst</field>
         </record>
 
         <record id="res_partner_address_25" model="res.partner">
             <field name="name">Jacob Taylor</field>
             <field name="parent_id" ref="res_partner_15"/>
             <field name="use_parent_address" eval="1"/>
+            <field eval="[(6, 0, [ref('res_partner_category_17')])]" name="category_id"/>
+            <field name="function">Order Clerk</field>
         </record>
 
         <record id="res_partner_address_26" model="res.partner">
             <field name="name">Arthur Gomez</field>
             <field name="parent_id" ref="res_partner_16"/>
             <field name="use_parent_address" eval="1"/>
+            <field eval="[(6, 0, [ref('res_partner_category_22')])]" name="category_id"/>
+            <field name="function">Software Developer</field>
         </record>
 
         <record id="res_partner_address_27" model="res.partner">
             <field name="name">Julia Rivero</field>
             <field name="parent_id" ref="res_partner_16"/>
             <field name="use_parent_address" eval="1"/>
+            <field eval="[(6, 0, [ref('res_partner_category_17')])]" name="category_id"/>
+            <field name="function">Technical Director</field>
         </record>
 
         <record id="res_partner_address_28" model="res.partner">
             <field name="name">Benjamin Flores</field>
             <field name="parent_id" ref="res_partner_17"/>
             <field name="use_parent_address" eval="1"/>
+            <field eval="[(6, 0, [ref('res_partner_category_17')])]" name="category_id"/>
+            <field name="function">Business Executive</field>
         </record>
 
         <record id="res_partner_address_29" model="res.partner">
             <field name="name">George Wilson</field>
             <field name="parent_id" ref="res_partner_18"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Chief Information Officer (CIO)</field>
         </record>
 
         <record id="res_partner_address_30" model="res.partner">
             <field name="name">Lucas Jones</field>
             <field name="parent_id" ref="res_partner_18"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Functional Consultant</field>
         </record>
 
         <record id="res_partner_address_31" model="res.partner">
             <field name="name">Edward Foster</field>
             <field name="parent_id" ref="res_partner_19"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Sales Representative</field>
         </record>
 
         <record id="res_partner_address_32" model="res.partner">
             <field name="name">Robin Smith</field>
             <field name="parent_id" ref="res_partner_21"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Sales Manager</field>
         </record>
 
         <record id="res_partner_address_33" model="res.partner">
             <field name="name">Morgan Rose</field>
             <field name="parent_id" ref="res_partner_21"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Financial Manager</field>
         </record>
 
         <record id="res_partner_address_34" model="res.partner">
             <field name="name">Kevin Clarke</field>
             <field name="parent_id" ref="res_partner_21"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Knowledge Manager</field>
         </record>
 
         <record id="res_partner_address_35" model="res.partner">
             <field name="name">Peter Mitchell</field>
             <field name="parent_id" ref="res_partner_22"/>
             <field name="use_parent_address" eval="1"/>
+            <field name="function">Store Manager</field>
         </record>
 
         <!--