odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] purchase: warehouse_id references fixed in reports 

bzr revid: qdp-launchpad@openerp.com-20130905065240-apd56dl1pgr0zzbh
This commit is contained in:
Quentin (OpenERP) 2013-09-05 08:52:40 +02:00
parent 34a6f75083
commit c4ef59844c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/purchase/report/order.rml
View File

@ -144,8 +144,8 @@
<tr>
<td>
<para style="terp_default_Bold_9"><b>Shipping address :</b></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.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_id)) or '']]</para>
<para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.name) or (o.picking_type_id.warehouse_id and o.picking_type_id.warehouse_id.name) or '']]</para>
<para style="terp_default_9">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.picking_type_id.warehouse_id and display_address(o.picking_type_id.warehouse_id.partner_id)) or '']]</para>
</td>
</tr>
</blockTable>

2
addons/purchase/report/request_quotation.rml
View File

@ -62,7 +62,7 @@
<tr>
<td>
<para style="terp_default_Bold_9"><b>Expected Delivery address:</b></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 order.dest_address_id.name) or (order.picking_type_id.warehouse_id and order.picking_type_id.warehouse_id.name) or '']]</para>
<para style="P1">[[ order.dest_address_id and display_address(order.dest_address_id) ]]</para>
</td>
</tr>