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

[IMP] changed the use of display_address function in reports 

bzr revid: qdp-launchpad@openerp.com-20111201154505-ps3b3m56dza0vjfl
This commit is contained in:
Quentin (OpenERP) 2011-12-01 16:45:05 +01:00
parent 40037e238f
commit 645e15577d
14 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/report/account_print_invoice.rml
View File

@ -162,7 +162,7 @@
</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">[[ o.address_invoice_id.display_address(o.address_invoice_id) ]]</para>
<para style="terp_default_8">[[ display_address(o.address_invoice_id) ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>

2
addons/account_invoice_layout/report/report_account_invoice_layout.rml
View File

@ -193,7 +193,7 @@
</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">[[ o.address_invoice_id.display_address(o.address_invoice_id) ]]</para>
<para style="terp_default_8">[[ display_address(o.address_invoice_id) ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>

2
addons/account_invoice_layout/report/special_message_invoice.rml
View File

@ -197,7 +197,7 @@
</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">[[ o.address_invoice_id.display_address(o.address_invoice_id) ]]</para>
<para style="terp_default_8">[[ display_address(o.address_invoice_id) ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>

2
addons/auction/report/buyer_form_report.rml
View File

@ -99,7 +99,7 @@
</td>
<td>
<para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
<para style="Addressee">[[o['partner'] and o['partner'].address[0] and o['partner'].address[0].display_address(o['partner'].address[0]) ]]</para>
<para style="Addressee">[[o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) ]]</para>
</td>
</tr>
</blockTable>

2
addons/auction/report/deposit_seller.rml
View File

@ -84,7 +84,7 @@
</para>
<para style="P5">[[o.bord_vnd_id.partner_id.title]]</para>
<para style="P5">[[o.bord_vnd_id.partner_id.name]]</para>
<para style="P5">[[o.bord_vnd_id.partner_id.address[0] and o.bord_vnd_id.partner_id.address[0].display_address(o.bord_vnd_id.partner_id.address[0]) ]] </para>
<para style="P5">[[o.bord_vnd_id.partner_id.address and display_address(o.bord_vnd_id.partner_id.address[0]) ]] </para>
<para style="P6">
<font color="white"> </font>
</para>

2
addons/auction/report/seller_form_report.rml
View File

@ -74,7 +74,7 @@
</td>
<td>
<para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
<para style="Addressee">[[ o['partner'] and o['partner'].address[0] and o['partner'].address[0].display_address(o['partner'].address[0]) </para>
<para style="Addressee">[[ o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) </para>
<para style="P4">
<font color="white"> </font>
</para>

4
addons/delivery/report/shipping.rml
View File

@ -131,11 +131,11 @@
<td>
<para style="terp_default_Bold_9">Invoiced to</para>
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']]</para>
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.display_address(o.sale_id.partner_invoice_id) ]]</para>
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and display_address(o.sale_id.partner_invoice_id) ]]</para>
</td>
<td>
<para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '' ]]</para>
<para style="terp_default_9">[[ o.address_id and o.address_id and o.address_id.display_address(o.address_id) ]]</para>
<para style="terp_default_9">[[ o.address_id and o.address_id and display_address(o.address_id) ]]</para>
</td>
</tr>
</blockTable>

6
addons/mrp_repair/report/order.rml
View File

@ -189,13 +189,13 @@
<td>
<para style="P5">Shipping address :</para>
<para style="P3">[[ o.partner_id.name ]]</para>
<para style="P3">[[ o.address_id and o.address_id.display_address(o.address_id) ]] </para>
<para style="P3">[[ o.address_id and display_address(o.address_id) ]] </para>
<para style="P3">
<font color="white"> </font>
</para>
<para style="P13">Invoice address :</para>
<para style="P3">[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
<para style="P3">[[ o.partner_invoice_id and o.partner_invoice_id.display_address(o.partner_invoice_id) ]] </para>
<para style="P3">[[ o.partner_invoice_id and display_address(o.partner_invoice_id) ]] </para>
</td>
<td>
<para style="P12">
@ -204,7 +204,7 @@
</td>
<td>
<para style="P3">[[ o.partner_id.name or removeParentNode('para') ]]</para>
<para style="P3">[[ o.default_address_id and o.default_address_id.display_address(o.default_address_id) ]] </para>
<para style="P3">[[ o.default_address_id and display_address(o.default_address_id) ]] </para>
<para style="P3">
<font color="white"> </font>
</para>

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

@ -167,11 +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.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.dest_address_id and o.dest_address_id.state_id and o.dest_address_id.state_id.name) or (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 removeParentNode('para') ]] </para>
<para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.country_id and o.dest_address_id.country_id.name) or (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) ]]</para>
<para style="terp_default_9">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and displaye_address(o.warehouse_id.partner_address_id)) or '']]</para>
</td>
</tr>
</blockTable>
@ -186,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_address_id and o.partner_address_id.display_address(o.partner_address_id) ]] </para>
<para style="terp_default_9">[[ o.partner_address_id and display_address(o.partner_address_id) ]] </para>
<para style="terp_default_9">
<font color="white"> </font>
</para>

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

@ -92,7 +92,7 @@
<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 order.dest_address_id.display_address(order.dest_address_id) ]] </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_address_id and order.partner_address_id.display_address(order.partner_address_id) ]] </para>
<para style="terp_default_9">[[ order.partner_address_id and display_address(order.partner_address_id) ]] </para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
@ -172,4 +172,4 @@
<para style="terp_default_9">[[ user.signature or '' ]]</para>
</pto>
</story>
</document>
</document>

4
addons/report_intrastat/report/invoice.rml
View File

@ -142,7 +142,7 @@
</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">[[ o.address_invoice_id and o.address_invoice_id.display_address(o.address_invoice_id) ]] </para>
<para style="terp_default_8">[[ o.address_invoice_id and display_address(o.address_invoice_id) ]] </para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
@ -398,4 +398,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>

6
addons/sale/report/sale_order.rml
View File

@ -158,13 +158,13 @@
<td>
<para style="terp_default_Bold_9">Shipping address :</para>
<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_shipping_id and o.partner_shipping_id.display_address(o.partner_shipping_id) ]]</para>
<para style="terp_default_9">[[ o.partner_shipping_id and display_address(o.partner_shipping_id) ]]</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 and o.partner_invoice_id.title and o.partner_invoice_id.title.name) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.name) or '' ]]</para>
<para style="terp_default_9">[[ o.partner_invoice_id and o.partner_invoice_id.display_address(o.partner_invoice_id) ]] </para>
<para style="terp_default_9">[[ o.partner_invoice_id and display_address(o.partner_invoice_id) ]] </para>
</td>
<td>
<para style="terp_default_8">
@ -173,7 +173,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_order_id and o.partner_order_id.display_address(o.partner_order_id) ]] </para>
<para style="terp_default_9">[[ o.partner_order_id and display_address(o.partner_order_id) ]] </para>
<para style="terp_default_9">
<font color="white"> </font>
</para>

8
addons/sale_layout/report/report_sale_layout.rml
View File

@ -140,13 +140,13 @@
<td>
<para style="terp_default_Bold_9">Shipping address :</para>
<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_shipping_id and o.partner_shipping_id.display_address(o.partner_shipping_id) ]] </para>
<para style="terp_default_9">[[ o.partner_shipping_id and display_address(o.partner_shipping_id) ]] </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 and o.partner_invoice_id.title and o.partner_invoice_id.title.name) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.name) or '' ]]</para>
<para style="terp_default_9">[[ o.partner_invoice_id and o.partner_invoice_id.display_address(o.partner_invoice_id) ]] </para>
<para style="terp_default_9">[[ o.partner_invoice_id and display_address(o.partner_invoice_id) ]] </para>
</td>
<td>
<para style="terp_default_8">
@ -155,7 +155,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_order_id and o.partner_order_id.display_address(o.partner_order_id) ]] </para>
<para style="terp_default_9">[[ o.partner_order_id and display_address(o.partner_order_id) ]] </para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
@ -359,4 +359,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>

4
addons/stock/report/picking.rml
View File

@ -163,12 +163,12 @@
<td>
<para style="terp_default_Bold_9">Shipping Address :</para>
<para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title.name) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
<para style="terp_default_9">[[ picking.address_id and picking.address_id.display_address(picking.address_id) ]]</para>
<para style="terp_default_9">[[ picking.address_id and display_address(picking.address_id) ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Contact Address :</para>
<para style="terp_default_9">[[ picking.address_id and picking.address_id.title.name or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para>
<para style="terp_default_9">[[ picking.address_id and picking.address_id.display_address(picking.address_id) ]] </para>
<para style="terp_default_9">[[ picking.address_id and display_address(picking.address_id) ]] </para>
</td>
</tr>
</blockTable>