diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index befc46c1cf4..2ce88479c9a 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -70,12 +70,6 @@
-
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3582d9683b3..1401b22a321 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2242,8 +2242,9 @@ class stock_warehouse(osv.osv):
def onchange_filter_default_resupply_wh_id(self, cr, uid, ids, default_resupply_wh_id, resupply_wh_ids, context=None):
resupply_wh_ids = set([x['id'] for x in (self.resolve_2many_commands(cr, uid, 'resupply_wh_ids', resupply_wh_ids, ['id']))])
- resupply_wh_ids.add(default_resupply_wh_id)
- resupply_wh_ids = list(resupply_wh_ids)
+ if default_resupply_wh_id: #If we are removing the default resupply, we don't have default_resupply_wh_id
+ resupply_wh_ids.add(default_resupply_wh_id)
+ resupply_wh_ids = list(resupply_wh_ids)
return {'value': {'resupply_wh_ids': resupply_wh_ids}}
def _get_inter_wh_location(self, cr, uid, warehouse, context=None):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9e794b89084..e576811ea44 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1394,7 +1394,7 @@
-
+
@@ -1408,7 +1408,7 @@
-
+
diff --git a/addons/stock_complex_routes/stock_complex_routes.xml b/addons/stock_complex_routes/stock_complex_routes.xml
index 189b80cdfc1..5268702adcf 100644
--- a/addons/stock_complex_routes/stock_complex_routes.xml
+++ b/addons/stock_complex_routes/stock_complex_routes.xml
@@ -12,7 +12,7 @@
- dropship
+ Dropship
incoming