diff --git a/delivery_usability/__init__.py b/delivery_usability/__init__.py
index 633f866..b857415 100644
--- a/delivery_usability/__init__.py
+++ b/delivery_usability/__init__.py
@@ -1,2 +1,3 @@
 # -*- coding: utf-8 -*-
 
+from . import stock
diff --git a/delivery_usability/__manifest__.py b/delivery_usability/__manifest__.py
index 07bb55e..af65a8e 100644
--- a/delivery_usability/__manifest__.py
+++ b/delivery_usability/__manifest__.py
@@ -24,6 +24,7 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
     'data': [
         'delivery_view.xml',
         'sale_view.xml',
+        'stock_view.xml',
         ],
     'installable': True,
 }
diff --git a/delivery_usability/stock.py b/delivery_usability/stock.py
new file mode 100644
index 0000000..9fb3571
--- /dev/null
+++ b/delivery_usability/stock.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 Akretion (http://www.akretion.com)
+# @author Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class StockPicking(models.Model):
+    _inherit = 'stock.picking'
+
+    carrier_id = fields.Many2one(track_visibility='onchange')
diff --git a/delivery_usability/stock_view.xml b/delivery_usability/stock_view.xml
new file mode 100644
index 0000000..b0a0b43
--- /dev/null
+++ b/delivery_usability/stock_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2018 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+
+<odoo>
+
+<record id="view_picking_withcarrier_out_form" model="ir.ui.view">
+    <field name="name">delivery_usability.stock.picking.form</field>
+    <field name="model">stock.picking</field>
+    <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form"/>
+    <field name="arch" type="xml">
+        <field name="carrier_id" position="attributes">
+            <!-- Sometimes we have to modify carrier_id when state is done
+            so remove readonly when state = done from view and add tracking on_change in
+            field definition -->
+            <attribute name="attrs">{}</attribute>
+        </field>
+    </field>
+</record>
+
+</odoo>