diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 8b18331d2bf..2b6b844872a 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -35,7 +35,7 @@ class report_stock_move(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
-        'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
+        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'picking_id':fields.many2one('stock.picking', 'Packing', readonly=True),
@@ -154,7 +154,7 @@ class report_stock_inventory(osv.osv):
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September')]),
-        'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
+        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True),
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 3940804eb5c..ccb33175b22 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -187,9 +187,9 @@
             <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
             <field name="address" eval="[]"/>
         </record>
-        <record id="res_partner_address_fabien0" model="res.partner.address">
+        <record id="res_partner_address_fabien0" model="res.partner">
             <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
-            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field name="parent_id" ref="res_partner_tinyshop0"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_company_shop0" model="res.company">
@@ -205,9 +205,9 @@
             <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
             <field name="address" eval="[]"/>
         </record>
-        <record id="res_partner_address_eric0" model="res.partner.address">
+        <record id="res_partner_address_eric0" model="res.partner">
             <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field name="parent_id" ref="res_partner_tinyshop1"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_company_tinyshop0" model="res.company">
@@ -217,7 +217,7 @@
             <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
         </record>
         <record id="stock_location_shop0" model="stock.location">
-            <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
+            <field model="res.partner" name="address_id" search="[('name','=','Fabien')]"/>
             <field name="location_id" ref="stock.stock_location_locations"/>
             <field name="company_id" ref="res_company_shop0"/>
             <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
@@ -227,7 +227,7 @@
             <field eval="&quot;&quot;&quot;manual&quot;&quot;&quot;" name="chained_auto_packing"/>
         </record>
         <record id="stock_location_shop1" model="stock.location">
-            <field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
+            <field model="res.partner" name="address_id" search="[('name','=','Eric')]"/>
             <field name="company_id" ref="res_company_tinyshop0"/>
             <field name="location_id" ref="stock.stock_location_locations"/>
             <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>