From 64c2a01fbee889dac5b79e8ed2734e6e650c6b39 Mon Sep 17 00:00:00 2001
From: "Sbh (Openerp)" <sbh@tinyerp.com>
Date: Thu, 22 Mar 2012 17:09:25 +0530
Subject: [PATCH] [IMP] account,auction: remove address from report

bzr revid: sbh@tinyerp.com-20120322113925-20r4ilx6a22avdj0
---
 .../report/check_print_bottom.rml             | 20 +++++++++----------
 .../report/check_print_middle.rml             | 16 +++++++--------
 .../report/check_print_top.rml                | 16 +++++++--------
 addons/auction/report/buyer_form_report.rml   |  2 +-
 addons/auction/report/deposit_seller.rml      |  2 +-
 addons/auction/report/seller_form_report.rml  |  2 +-
 6 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/addons/account_check_writing/report/check_print_bottom.rml b/addons/account_check_writing/report/check_print_bottom.rml
index 231edb65547..bb499a8aac1 100644
--- a/addons/account_check_writing/report/check_print_bottom.rml
+++ b/addons/account_check_writing/report/check_print_bottom.rml
@@ -169,7 +169,7 @@
           </para>
         </td>
       </tr>
-    </blockTable>    
+    </blockTable>
     <blockTable colWidths="568.0" style="Table3">
       <tr>
         <td>
@@ -245,7 +245,7 @@
     </blockTable>
     <para style="P2">
       <font color="white"> </font>
-    </para>    
+    </para>
     <blockTable colWidths="568.0"  style="Table1">
       <tr>
         <td>
@@ -259,7 +259,7 @@
               <td>
                 <para style="P9">[[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
               </td>
-            </tr>          
+            </tr>
             <tr>
               <td>
                 <para style="P9"></para>
@@ -281,10 +281,10 @@
               </td>
               <td>
                 <para style="P15">[[ voucher.partner_id.name ]]</para>
-                <para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street or removeParentNode('para') ]]</para>
-                <para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id.address) ]] </para>
-                <para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para>                
+                <para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
+                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
+                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
+                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
               </td>
             </tr>
           </blockTable>
@@ -295,7 +295,7 @@
               </td>
             </tr>
           </blockTable>
-          
+
           <blockTable colWidths="25.0,500" style="Table12">
             <tr>
               <td>
@@ -306,11 +306,11 @@
               <td>
                 <para style="P3">
                   <font color="white"> </font>
-                </para>                    
+                </para>
                 <!--para style="P15">[[ voucher.name ]]</para-->
               </td>
             </tr>
-          </blockTable>          
+          </blockTable>
           <para style="P3">
             <font color="white"> </font>
           </para>
diff --git a/addons/account_check_writing/report/check_print_middle.rml b/addons/account_check_writing/report/check_print_middle.rml
index a6416f9aeb2..5a2f83f20a2 100644
--- a/addons/account_check_writing/report/check_print_middle.rml
+++ b/addons/account_check_writing/report/check_print_middle.rml
@@ -193,7 +193,7 @@
           </para>
         </td>
       </tr>
-    </blockTable>    
+    </blockTable>
     <blockTable colWidths="550.0" rowHeights="10" style="Table5">
             <tr>
               <td>
@@ -215,7 +215,7 @@
               <td>
                 <para style="P9"></para>
               </td>
-            </tr>          
+            </tr>
             <tr>
               <td>
                 <para style="P9"></para>
@@ -237,10 +237,10 @@
               </td>
               <td>
                 <para style="P15">[[ voucher.partner_id.name ]]</para>
-                <para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street or removeParentNode('para') ]]</para>
-                <para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id.address) ]] </para>
-                <para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para>                
+                <para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
+                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
+                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
+                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
               </td>
             </tr>
           </blockTable>
@@ -254,11 +254,11 @@
               <td>
                 <para style="P3">
                   <font color="white"> </font>
-                </para>                    
+                </para>
                 <!--para style="P15">[[ voucher.name ]]</para-->
               </td>
             </tr>
-          </blockTable>          
+          </blockTable>
           <para style="P3">
             <font color="white"> </font>
           </para>
diff --git a/addons/account_check_writing/report/check_print_top.rml b/addons/account_check_writing/report/check_print_top.rml
index a5068617ebe..41526605f47 100644
--- a/addons/account_check_writing/report/check_print_top.rml
+++ b/addons/account_check_writing/report/check_print_top.rml
@@ -112,7 +112,7 @@
                   <font color="white"> </font>
                 </para>
               </td>
-            </tr>              
+            </tr>
             <tr>
               <td>
                 <para style="P6">
@@ -123,7 +123,7 @@
                 <para style="P9">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
               </td>
             </tr>
-          </blockTable>        
+          </blockTable>
           <blockTable colWidths="54.0,425.0,85.0" rowHeights="21.5" style="Table4">
             <tr>
               <td>
@@ -153,15 +153,15 @@
               </td>
               <td>
                 <para style="P9">[[ voucher.partner_id.name ]] </para>
-                <para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id.address[0]) ]] </para>
-                <para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para>  
+                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
+                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
+                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
               </td>
               <td>
                 <para/>
               </td>
             </tr>
-          </blockTable>          
+          </blockTable>
           <blockTable colWidths="25.0,350,150" rowHeights="10.5" style="Table12">
             <tr>
               <td>
@@ -176,7 +176,7 @@
                 <para style="P3">
                   <font color="white"> </font>
                 </para>
-              </td>              
+              </td>
             </tr>
           </blockTable>
           <para style="P3">
@@ -184,7 +184,7 @@
           </para>
         </td>
       </tr>
-    </blockTable>    
+    </blockTable>
     <blockTable colWidths="568.0" style="Table2" rowHeights="255">
       <tr>
         <td>
diff --git a/addons/auction/report/buyer_form_report.rml b/addons/auction/report/buyer_form_report.rml
index 7f9a124e2d9..ed1804be8a2 100644
--- a/addons/auction/report/buyer_form_report.rml
+++ b/addons/auction/report/buyer_form_report.rml
@@ -99,7 +99,7 @@
         </td>
         <td>
           <para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
-          <para style="Addressee">[[o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) ]]</para>
+          <para style="Addressee">[[o['partner'] and o['partner'] and display_address(o['partner']) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/auction/report/deposit_seller.rml b/addons/auction/report/deposit_seller.rml
index 7259ef005d3..b300784d83a 100644
--- a/addons/auction/report/deposit_seller.rml
+++ b/addons/auction/report/deposit_seller.rml
@@ -84,7 +84,7 @@
           </para>
           <para style="P5">[[o.bord_vnd_id.partner_id.title]]</para>
           <para style="P5">[[o.bord_vnd_id.partner_id.name]]</para>
-          <para style="P5">[[o.bord_vnd_id.partner_id.address and display_address(o.bord_vnd_id.partner_id.address[0]) ]] </para>
+          <para style="P5">[[o.bord_vnd_id.partner_id and display_address(o.bord_vnd_id.partner_id) ]] </para>
           <para style="P6">
             <font color="white"> </font>
           </para>
diff --git a/addons/auction/report/seller_form_report.rml b/addons/auction/report/seller_form_report.rml
index 5d1669802b4..da83950b463 100644
--- a/addons/auction/report/seller_form_report.rml
+++ b/addons/auction/report/seller_form_report.rml
@@ -74,7 +74,7 @@
         </td>
         <td>
           <para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
-          <para style="Addressee">[[ o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) </para>
+          <para style="Addressee">[[ o['partner'] and o['partner'] and display_address(o['partner']) </para>
           <para style="P4">
             <font color="white"> </font>
           </para>