From 8367adba081405d477ff77cd6afd612021afb7e9 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Tue, 6 Mar 2012 12:13:27 +0530
Subject: [PATCH] [IMP]account_invoice_layout: set invoice address for report

bzr revid: kjo@tinyerp.com-20120306064327-x02hchrwwu5ou0s7
---
 .../report/report_account_invoice_layout.rml              | 8 ++++----
 .../report/special_message_invoice.rml                    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 2cff52d4146..6a9de4f7f41 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -193,12 +193,12 @@
         </td>
         <td>
           <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.address_invoice_id) ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id, 'invoice') ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.partner_id and o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.partner_id and o.partner_id.fax) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
@@ -247,7 +247,7 @@
           <para style="terp_default_Centre_9">[[ o.name or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
+          <para style="terp_default_Centre_9">[[ (o.partner_id and o.partner_id.ref) or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index f474a44d161..bd3eb175dd0 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -197,12 +197,12 @@
         </td>
         <td>
           <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.address_invoice_id) ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id, 'invoice') ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.partner_id and o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.partner_id and o.partner_id.fax) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
@@ -251,7 +251,7 @@
           <para style="terp_default_Centre_9">[[ o.name or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
+          <para style="terp_default_Centre_9">[[ ( o.partner_id and o.partner_id.ref) or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>