diff --git a/sale_order_route/__manifest__.py b/sale_order_route/__manifest__.py
index 8f25a5b..06cc24e 100644
--- a/sale_order_route/__manifest__.py
+++ b/sale_order_route/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     'name': 'Sale Order Route',
-    'version': '16.0.1.0.0',
+    'version': '18.0.1.0.0',
     'category': 'Sales',
     'license': 'AGPL-3',
     'summary': 'Set route on sale order',
@@ -18,5 +18,5 @@ This module has been written by Alexis de Lattre from Akretion
     'website': 'http://www.akretion.com',
     'depends': ['sale_stock'],
     'data': ['views/sale_order.xml', 'views/sale_report.xml'],
-    'installable': False,
+    'installable': True,
 }
diff --git a/sale_order_route/models/sale_order.py b/sale_order_route/models/sale_order.py
index 369e147..0efb8a5 100644
--- a/sale_order_route/models/sale_order.py
+++ b/sale_order_route/models/sale_order.py
@@ -11,7 +11,6 @@ class SaleOrder(models.Model):
     route_id = fields.Many2one(
         'stock.route', string='Route',
         ondelete='restrict', readonly=True, tracking=True,
-        states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
         check_company=True,
         domain="['|', ('company_id', '=', company_id), ('company_id', '=', False), ('sale_selectable', '=', True)]")
 
@@ -22,7 +21,7 @@ class SaleOrder(models.Model):
             vals = {'route_id': order.route_id.id or False}
             order.order_line.filtered(
                 lambda l:
-                l.product_id and l.product_id.type in ('product', 'consu')).write(vals)
+                l.product_id and l.product_id.type == 'consu').write(vals)
         return super()._action_confirm()
 
 
@@ -35,7 +34,7 @@ class SaleOrderLine(models.Model):
     @api.depends('display_type', 'product_id')
     def _compute_route_id(self):
         for line in self:
-            if not line.display_type and line.product_id and line.product_id.type in ('product', 'consu'):
+            if not line.display_type and line.product_id and line.product_id.type == 'consu':
                 line.route_id = line.order_id.route_id or False
             else:
                 line.route_id = False
diff --git a/sale_order_route/views/sale_order.xml b/sale_order_route/views/sale_order.xml
index 41588bd..14c3f0e 100644
--- a/sale_order_route/views/sale_order.xml
+++ b/sale_order_route/views/sale_order.xml
@@ -13,14 +13,14 @@
     <field name="inherit_id" ref="sale_stock.view_order_form_inherit_sale_stock"/>
     <field name="arch" type="xml">
         <field name="partner_shipping_id" position="after">
-            <field name="route_id" options="{'no_create_edit': True}"/>
+            <field name="route_id" options="{'no_create_edit': True}" readonly="state not in ('draft', 'sent')"/>
         </field>
     </field>
 </record>
 
 <record id="view_quotation_tree" model="ir.ui.view">
     <field name="model">sale.order</field>
-    <field name="inherit_id" ref="sale_stock.view_quotation_tree"/>
+    <field name="inherit_id" ref="sale_stock.sale_order_tree"/>
     <field name="arch" type="xml">
         <field name="warehouse_id" position="after">
             <field name="route_id" optional="hide"/>
@@ -28,15 +28,4 @@
     </field>
 </record>
 
-<record id="view_order_tree" model="ir.ui.view">
-    <field name="model">sale.order</field>
-    <field name="inherit_id" ref="sale_stock.view_order_tree"/>
-    <field name="arch" type="xml">
-        <field name="warehouse_id" position="after">
-            <field name="route_id" optional="hide"/>
-        </field>
-    </field>
-</record>
-
-
 </odoo>