From 4f50981946228dc2ef5075fa6f865898eb6a42ea Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 16 Sep 2009 20:17:04 +0530
Subject: [PATCH] [FIX + IMP] Sale :consistency in order report(addresses,date)

lp bug: https://launchpad.net/bugs/430516 fixed
lp bug: https://launchpad.net/bugs/430522 fixed

bzr revid: jvo@tinyerp.com-20090916144704-1dyh5w84ng9m27td
---
 addons/sale/report/order.rml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml
index fac75e4f4d9..fa03eb1624b 100644
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/order.rml
@@ -138,14 +138,16 @@
           <para style="terp_default_9">[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street2 or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]] [[ o.partner_shipping_id.zip or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]] [[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
           <para style="terp_default_Bold_9">Invoice address :</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.title or '' ]] [[ o.partner_invoice_id.name or '' ]] </para>
           <para style="terp_default_9">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name or '' ]] [[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]</para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -185,7 +187,7 @@
           <para style="terp_tblheader_General_Centre">Your Reference </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Date Ordered </para>
+          <para style="terp_tblheader_General_Centre">[[ o.state=='draft' and 'Quotation Date' or 'Date Ordered' ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Our Salesman </para>