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

[FIX] purchase: display only one shipping address 

The warehouse location is the fallback value
Fixes #4056
This commit is contained in:
sve-openerp 2014-12-05 09:58:20 +01:00 committed by Martin Trigaux
parent 182adcdcd6
commit a5d7d2072f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/purchase/views/report_purchaseorder.xml
View File

@ -14,7 +14,7 @@
<p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
</div>
<div t-if="o.picking_type_id and o.picking_type_id.warehouse_id">
<div t-if="not o.dest_address_id and o.picking_type_id and o.picking_type_id.warehouse_id">
<span t-field="o.picking_type_id.warehouse_id.name"/>
<div t-field="o.picking_type_id.warehouse_id.partner_id"
t-field-options='{"widget": "contact", "fields": ["address", "phone", "fax"], "no_marker": true}'/>

2
addons/purchase/views/report_purchasequotation.xml
View File

@ -14,7 +14,7 @@
t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
<p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
</div>
<div t-if="o.picking_type_id.warehouse_id">
<div t-if="not o.dest_address_id and o.picking_type_id.warehouse_id">
<span t-field="o.picking_type_id.warehouse_id.name"/>
<div t-field="o.picking_type_id.warehouse_id.partner_id"
t-field-options='{"widget": "contact", "fields": ["address", "phone", "fax"], "no_marker": true}'/>