From 4f1bfdf640cc1153912127f4da01f9719a2dada1 Mon Sep 17 00:00:00 2001
From: Martin Geubelle <mge@odoo.com>
Date: Wed, 23 Dec 2015 16:04:03 +0100
Subject: [PATCH] [FIX] delivery: tracking button traceback

If one set a carrier_tracking_ref on a stock.picking,
but the carrier_id is not set, the button Tracking
will appear but crash as this button calls a method on
the carrier.

opw-660659
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 12c03277263..079c35e0d83 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -256,7 +256,7 @@
                   </xpath>
                   <xpath expr="//h1" position="before">
                       <div class="oe_right oe_button_box">
-                          <button type="object" name="open_website_url" class="oe_stat_button" icon='fa-truck' string="Tracking" attrs="{'invisible': ['|',('carrier_tracking_ref','=',False),('delivery_type','=','grid')]}" />
+                          <button type="object" name="open_website_url" class="oe_stat_button" icon='fa-truck' string="Tracking" attrs="{'invisible': ['|','|',('carrier_tracking_ref','=',False),('carrier_id', '=', False),('delivery_type','=','grid')]}" />
                       </div>
                   </xpath>
                   <xpath expr="//form[@string='Transfer']/header/button[last()]" position="after">