diff --git a/openerp/addons/base/report/corporate_sxw_header.xml b/openerp/addons/base/report/corporate_sxw_header.xml
index d6330e66a7a..d752ffa91a5 100644
--- a/openerp/addons/base/report/corporate_sxw_header.xml
+++ b/openerp/addons/base/report/corporate_sxw_header.xml
@@ -204,8 +204,8 @@
- [[ company.partner_id and company.partner_id.street ]]
- [[ 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 ]]
+ [[ company.partner_id.street ]]
+ [[ company.partner_id.zip ]] [[ company.partner_id.city ]] - [[ company.partner_id.country_id and company.partner_id.country_id.name ]]
@@ -214,7 +214,7 @@
Phone :
- [[ company.partner_id and company.partner_id.phone ]]
+ [[ company.partner_id.phone ]]
@@ -222,7 +222,7 @@
Mail :
- [[ company.partner_id and company.partner_id.email ]]
+ [[ company.partner_id.email ]]
diff --git a/openerp/addons/base/report/mako_header.html b/openerp/addons/base/report/mako_header.html
index a8c7d71b8d9..02839e1ffb3 100644
--- a/openerp/addons/base/report/mako_header.html
+++ b/openerp/addons/base/report/mako_header.html
@@ -14,7 +14,7 @@
|
- % if company['partner_id'] and company['partner_id']['street']:
+ % if company['partner_id']['street']:
${company.partner_id.street}
%endif
|
@@ -22,7 +22,7 @@
|
- % if company['partner_id'] and company['partner_id']['zip']:
+ % if company['partner_id']['zip']:
${company.partner_id.zip}
${company.partner_id.city}-${company.partner_id.country_id and company.partner_id.country_id.name}
%endif
@@ -31,16 +31,16 @@
|
|
- % if company['partner_id'] and company['partner_id']['phone']:
- Phone:${company.partner_id and company.partner_id.phone}
+ % if company['partner_id']['phone']:
+ Phone:${company.partner_id.phone}
%endif
|
|
- % if company['partner_id'] and company['partner_id']['email']:
- Mail:${company.partner_id and company.partner_id.email}
+ % if company['partner_id']['email']:
+ Mail:${company.partner_id.email}
%endif
|