diff --git a/openerp/addons/base/report/corporate_sxw_header.xml b/openerp/addons/base/report/corporate_sxw_header.xml
index 2f6f885f3ba..d6330e66a7a 100644
--- a/openerp/addons/base/report/corporate_sxw_header.xml
+++ b/openerp/addons/base/report/corporate_sxw_header.xml
@@ -204,8 +204,8 @@
                         </table:table-cell>
                     </table:table-row>
                 </table:table>
-                <text:p text:style-name="P3">[[ company.partner_id.address and company.partner_id.address[0].street ]]</text:p>
-                <text:p text:style-name="P3">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</text:p>
+                <text:p text:style-name="P3">[[ company.partner_id and company.partner_id.street ]]</text:p>
+                <text:p text:style-name="P3">[[ company.partner_id and company.partner_id.zip ]] [[ company.partner_id and company.partner_id.city ]] - [[ company.partner_id and company.partner_id.country_id and company.partner_id.country_id.name ]]</text:p>
                 <table:table table:name="Table3" table:style-name="Table3">
                     <table:table-column table:style-name="Table3.A"/>
                     <table:table-column table:style-name="Table3.B"/>
@@ -214,7 +214,7 @@
                             <text:p text:style-name="P4">Phone :</text:p>
                         </table:table-cell>
                         <table:table-cell table:style-name="Table3.A1" table:value-type="string">
-                            <text:p text:style-name="P5">[[ company.partner_id.address and company.partner_id.address[0].phone ]]</text:p>
+                            <text:p text:style-name="P5">[[ company.partner_id and company.partner_id.phone ]]</text:p>
                         </table:table-cell>
                     </table:table-row>
                     <table:table-row>
@@ -222,7 +222,7 @@
                             <text:p text:style-name="P4">Mail :</text:p>
                         </table:table-cell>
                         <table:table-cell table:style-name="Table3.A2" table:value-type="string">
-                            <text:p text:style-name="P5">[[ company.partner_id.address and company.partner_id.address[0].email ]]</text:p>
+                            <text:p text:style-name="P5">[[ company.partner_id and company.partner_id.email ]]</text:p>
                         </table:table-cell>
                     </table:table-row>
                 </table:table>
diff --git a/openerp/addons/base/report/mako_header.html b/openerp/addons/base/report/mako_header.html
index 5bd3aaf18fb..a8c7d71b8d9 100644
--- a/openerp/addons/base/report/mako_header.html
+++ b/openerp/addons/base/report/mako_header.html
@@ -14,33 +14,33 @@
 
 	<tr>
  		<td>
-			% if company['partner_id']['address'] and company['partner_id']['address'][0]['street']:
-				<small>${company.partner_id.address[0].street}</small></br>
+			% if company['partner_id'] and company['partner_id']['street']:
+				<small>${company.partner_id.street}</small></br>
 			%endif
 		</td>
 	</tr>
 
 	<tr>
 		<td>
-			% if company['partner_id']['address'] and company['partner_id']['address'][0]['zip']:
-				<small>${company.partner_id.address[0].zip}
-				${company.partner_id.address[0].city}-${company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name}</small></br>
+			% if company['partner_id'] and company['partner_id']['zip']:
+				<small>${company.partner_id.zip}
+				${company.partner_id.city}-${company.partner_id.country_id and company.partner_id.country_id.name}</small></br>
 			%endif
 		</td>
 	</tr>
 
 	<tr>
  		<td>
-			% if company['partner_id']['address'] and company['partner_id']['address'][0]['phone']:
-				<small><b>Phone:</b>${company.partner_id.address and company.partner_id.address[0].phone}</small></br>
+			% if company['partner_id'] and company['partner_id']['phone']:
+				<small><b>Phone:</b>${company.partner_id and company.partner_id.phone}</small></br>
 			%endif
 		</td>
 	</tr>
 
 	<tr>
  		<td>
-			% if company['partner_id']['address'] and company['partner_id']['address'][0]['email']:
-				<small><b>Mail:</b>${company.partner_id.address and company.partner_id.address[0].email}</small></br></<address>
+			% if company['partner_id'] and company['partner_id']['email']:
+				<small><b>Mail:</b>${company.partner_id and company.partner_id.email}</small></br></<address>
 			%endif
 		</td>
 	</tr>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 8866846932c..0da8825c9f1 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -109,7 +109,7 @@ class res_company(osv.osv):
             if address:
                 part_obj.write(cr, uid, [address], {name: value or False})
             else:
-                part_obj.create(cr, uid, {name: value or False, 'partner_id': company.partner_id.id}, context=context)
+                part_obj.create(cr, uid, {name: value or False, 'parent_id': company.partner_id.id}, context=context)
         return True
 
 
@@ -294,12 +294,12 @@ class res_company(osv.osv):
 
 
             <drawString x="1.3cm" y="%s">[[ company.partner_id.name ]]</drawString>
-            <drawString x="1.3cm" y="%s">[[ company.partner_id.address and company.partner_id.address[0].street or  '' ]]</drawString>
-            <drawString x="1.3cm" y="%s">[[ company.partner_id.address and company.partner_id.address[0].zip or '' ]] [[ company.partner_id.address and company.partner_id.address[0].city or '' ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name  or '']]</drawString>
+            <drawString x="1.3cm" y="%s">[[ company.partner_id and company.partner_id.street or  '' ]]</drawString>
+            <drawString x="1.3cm" y="%s">[[ company.partner_id and company.partner_id.city or '' ]] - [[ company.partner_id and company.partner_id.country_id and company.partner_id.country_id.name  or '']]</drawString>
             <drawString x="1.3cm" y="%s">Phone:</drawString>
-            <drawRightString x="7cm" y="%s">[[ company.partner_id.address and company.partner_id.address[0].phone or '' ]]</drawRightString>
+            <drawRightString x="7cm" y="%s">[[ company.partner_id and company.partner_id.phone or '' ]]</drawRightString>
             <drawString x="1.3cm" y="%s">Mail:</drawString>
-            <drawRightString x="7cm" y="%s">[[ company.partner_id.address and company.partner_id.address[0].email or '' ]]</drawRightString>
+            <drawRightString x="7cm" y="%s">[[ company.partner_id and company.partner_id.email or '' ]]</drawRightString>
             <lines>1.3cm %s 7cm %s</lines>
 
             <!--page bottom-->