[IMP] purchase: Improve report

bzr revid: sbh@tinyerp.com-20120323062920-q0qrszoskdecmhjy

diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 2fbfb8e..b106ad4 100644 (file)
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -167,7 +167,7 @@
               <td>
                 <para style="terp_default_Bold_9">Shipping address :</para>
                 <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']]</para>
-                <para style="terp_default_9">[[ (o.dest_address_id and display_address(o.partner_id,'default')) or (o.warehouse_id and display_address(o.warehouse_id.partner_address_id)) or '']]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_address_id)) or '']]</para>
               </td>
             </tr>
           </blockTable>
@@ -182,7 +182,7 @@
         </td>
         <td>
           <para style="terp_default_9">[[ (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_9">[[ o.partner_id and display_address(o.partner_id,'default') ]] </para>
+          <para style="terp_default_9">[[ o.partner_id and display_address(o.partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>

diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 9d61f01..47b5058 100644 (file)
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -91,8 +91,8 @@
       <tr>
         <td>
           <para style="terp_default_Bold_9">Expected Delivery address:</para>
-          <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.partner_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
-          <para style="terp_default_9">[[ order.dest_address_id and display_address(order.dest_address_id,'delivery') ]] </para>
+          <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
+          <para style="terp_default_9">[[ order.dest_address_id and display_address(order.dest_address_id) ]] </para>
         </td>
         <td>
           <para style="terp_default_9">
@@ -101,7 +101,7 @@
         </td>
         <td>
           <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ order.partner_id and display_address(order.partner_id,'default') ]] </para>
+          <para style="terp_default_9">[[ order.partner_id and display_address(order.partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>