diff --git a/sale_stock_usability/__manifest__.py b/sale_stock_usability/__manifest__.py
index f925052..11a95b0 100644
--- a/sale_stock_usability/__manifest__.py
+++ b/sale_stock_usability/__manifest__.py
@@ -1,11 +1,11 @@
-# Copyright 2015-2020 Akretion (http://www.akretion.com)
+# Copyright 2015-2022 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).
 
 
 {
     'name': 'Sale Stock Usability',
-    'version': '14.0.1.0.0',
+    'version': '16.0.1.0.0',
     'category': 'Sales Management',
     'license': 'AGPL-3',
     'summary': 'Small usability improvements to the sale_stock module',
@@ -20,7 +20,7 @@ The usability enhancements include:
 This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
     """,
     'author': 'Akretion',
-    'website': 'http://www.akretion.com',
+    'website': 'https://github.com/akretion/odoo-usability',
     'depends': ['sale_stock'],
     'data': [
         'views/sale_order.xml',
@@ -28,5 +28,5 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
         'views/stock_move.xml',
         'views/stock_picking.xml',
         ],
-    'installable': False,
+    'installable': True,
 }
diff --git a/sale_stock_usability/models/sale_order.py b/sale_stock_usability/models/sale_order.py
index 4260023..777830d 100644
--- a/sale_stock_usability/models/sale_order.py
+++ b/sale_stock_usability/models/sale_order.py
@@ -11,6 +11,8 @@ class SaleOrder(models.Model):
 
     warehouse_id = fields.Many2one(tracking=True)
     incoterm = fields.Many2one(tracking=True)
+    incoterm_location = fields.Char(tracking=True)
+    picking_policy = fields.Selection(tracking=True)
 
     def report_qty_to_deliver(self):
         # Can be useful for delivery report
diff --git a/sale_stock_usability/views/procurement_group.xml b/sale_stock_usability/views/procurement_group.xml
index 4e60a09..991385d 100644
--- a/sale_stock_usability/views/procurement_group.xml
+++ b/sale_stock_usability/views/procurement_group.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
-  Copyright 2015-2020 Akretion France (http://www.akretion.com/)
+  Copyright 2015-2022 Akretion France (http://www.akretion.com/)
   @author Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
diff --git a/sale_stock_usability/views/sale_order.xml b/sale_stock_usability/views/sale_order.xml
index 97125b2..84b4468 100644
--- a/sale_stock_usability/views/sale_order.xml
+++ b/sale_stock_usability/views/sale_order.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2015-2020 Akretion France (http://www.akretion.com/)
+  Copyright 2015-2022 Akretion France (http://www.akretion.com/)
   @author Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
@@ -13,9 +13,11 @@
     <field name="inherit_id" ref="sale_stock.view_order_form_inherit_sale_stock"/>
     <field name="arch" type="xml">
         <!-- move warehouse_id to the top, not hidden in the 2nd tab -->
+        <xpath expr="//group[@name='sale_shipping']/field[@name='warehouse_id' and @force_save='1']" position="replace"/>
         <group name="order_details" position="inside">
-            <field name="warehouse_id" options="{'no_create': True}" groups="stock.group_stock_multi_warehouses" force_save="1" position="move"/>
+            <field name="warehouse_id" options="{'no_create': True}" groups="stock.group_stock_multi_warehouses" force_save="1"/>
         </group>
     </field>
 </record>
+
 </odoo>
diff --git a/sale_stock_usability/views/stock_move.xml b/sale_stock_usability/views/stock_move.xml
index b6debcb..8eb65c3 100644
--- a/sale_stock_usability/views/stock_move.xml
+++ b/sale_stock_usability/views/stock_move.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2015-2020 Akretion France (http://www.akretion.com/)
+  Copyright 2015-2022 Akretion France (http://www.akretion.com/)
   @author Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
diff --git a/sale_stock_usability/views/stock_picking.xml b/sale_stock_usability/views/stock_picking.xml
index 72cf745..24dfa0b 100644
--- a/sale_stock_usability/views/stock_picking.xml
+++ b/sale_stock_usability/views/stock_picking.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2015-2020 Akretion France (http://www.akretion.com/)
+  Copyright 2015-2022 Akretion France (http://www.akretion.com/)
   @author Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->