openerp-dev-web team mailing list archive

["Rohan Nayani\(Open ERP\)" <ron@xxxxxxxxxxx>]

Rohan Nayani(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-784265-ron into lp:openobject-addons.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)
Related bugs:
  Bug #784265 in OpenERP Addons: "Purchase Order report does not print destination address"
  https://bugs.launchpad.net/openobject-addons/+bug/784265

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-784265-ron/+merge/61701
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-784265-ron/+merge/61701
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-784265-ron.

=== modified file 'purchase/report/order.rml'
--- purchase/report/order.rml	2011-01-14 00:11:01 +0000
+++ purchase/report/order.rml	2011-05-20 06:37:29 +0000
@@ -165,21 +165,13 @@
           <blockTable colWidths="253.0" style="Tableau2">
             <tr>
               <td>
-                <para style="terp_default_9">
-                  <font color="white"> </font>
-                </para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
                 <para style="terp_default_Bold_9">Shipping address :</para>
-                <para style="terp_default_9">[[ (addr.partner_id and addr.partner_id.title and addr.partner_id.title.name) or '' ]] [[ (addr.partner_id and addr.partner_id.name) or '' ]]</para>
-                <para style="terp_default_9">[[ addr.street ]]</para>
-                <para style="terp_default_9">[[ addr.street2 or removeParentNode('para') ]]</para>
-                <para style="terp_default_9">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para>
-                <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or removeParentNode('para') ]]</para>
-                <para style="terp_default_9">[[ addr.country_id and addr.country_id.name or '' ]]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.partner_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.street) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.street) or '']]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.street2) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.street2) or removeParentNode('para') ]]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.zip) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.zip) or '' ]] [[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.city) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.city) or '' ]]</para>
+                <para style="terp_default_9">[[ (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.state_id and o.warehouse_id.partner_address_id.state_id.name) or o.partner_address_id and o.partner_address_id.state_id and o.partner_address_id.state_id.name or removeParentNode('para') ]] </para>
+                <para style="terp_default_9">[[ (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.country_id and o.warehouse_id.partner_address_id.country_id.name) or o.partner_address_id.country_id.name ]]</para>
               </td>
             </tr>
           </blockTable>