From 629d662f636eab939dbfa5e5da8634e3803ebf2c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 16 Mar 2012 14:53:39 +0100
Subject: [PATCH] [IMP] base, report header: simplified code by removing
 useless check as partner_id is required on res_company

bzr revid: qdp-launchpad@openerp.com-20120316135339-qsnr1qfcgc7mr94m
---
 openerp/addons/base/report/corporate_sxw_header.xml |  8 ++++----
 openerp/addons/base/report/mako_header.html         | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

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 @@
                         </table:table-cell>
                     </table:table-row>
                 </table:table>
-                <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>
+                <text:p text:style-name="P3">[[ company.partner_id.street ]]</text:p>
+                <text:p text:style-name="P3">[[ company.partner_id.zip ]] [[ company.partner_id.city ]] - [[ 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 and company.partner_id.phone ]]</text:p>
+                            <text:p text:style-name="P5">[[ 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 and company.partner_id.email ]]</text:p>
+                            <text:p text:style-name="P5">[[ 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 a8c7d71b8d9..02839e1ffb3 100644
--- a/openerp/addons/base/report/mako_header.html
+++ b/openerp/addons/base/report/mako_header.html
@@ -14,7 +14,7 @@
 
 	<tr>
  		<td>
-			% if company['partner_id'] and company['partner_id']['street']:
+			% if company['partner_id']['street']:
 				<small>${company.partner_id.street}</small></br>
 			%endif
 		</td>
@@ -22,7 +22,7 @@
 
 	<tr>
 		<td>
-			% if company['partner_id'] and company['partner_id']['zip']:
+			% if 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
@@ -31,16 +31,16 @@
 
 	<tr>
  		<td>
-			% if company['partner_id'] and company['partner_id']['phone']:
-				<small><b>Phone:</b>${company.partner_id and company.partner_id.phone}</small></br>
+			% if company['partner_id']['phone']:
+				<small><b>Phone:</b>${company.partner_id.phone}</small></br>
 			%endif
 		</td>
 	</tr>
 
 	<tr>
  		<td>
-			% if company['partner_id'] and company['partner_id']['email']:
-				<small><b>Mail:</b>${company.partner_id and company.partner_id.email}</small></br></<address>
+			% if company['partner_id']['email']:
+				<small><b>Mail:</b>${company.partner_id.email}</small></br></<address>
 			%endif
 		</td>
 	</tr>