From a5d7d2072f595a4322801dd36319d42f5b95016f Mon Sep 17 00:00:00 2001
From: sve-openerp <sve@odoo.com>
Date: Fri, 5 Dec 2014 09:58:20 +0100
Subject: [PATCH] [FIX] purchase: display only one shipping address

The warehouse location is the fallback value
Fixes #4056
---
 addons/purchase/views/report_purchaseorder.xml     | 2 +-
 addons/purchase/views/report_purchasequotation.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/views/report_purchaseorder.xml b/addons/purchase/views/report_purchaseorder.xml
index eaf7c57a95c..5e4e50c5cbe 100644
--- a/addons/purchase/views/report_purchaseorder.xml
+++ b/addons/purchase/views/report_purchaseorder.xml
@@ -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}'/>
diff --git a/addons/purchase/views/report_purchasequotation.xml b/addons/purchase/views/report_purchasequotation.xml
index aaf1c8175ac..a2ff8cdddc0 100644
--- a/addons/purchase/views/report_purchasequotation.xml
+++ b/addons/purchase/views/report_purchasequotation.xml
@@ -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}'/>