diff --git a/addons/website_sale_delivery_mondialrelay/views/delivery_carrier_views.xml b/addons/website_sale_mondialrelay/views/delivery_carrier_views.xml
similarity index 77%
rename from addons/website_sale_delivery_mondialrelay/views/delivery_carrier_views.xml
rename to addons/website_sale_mondialrelay/views/delivery_carrier_views.xml
index 75e2b3aafe5..6af18f83a49 100644
--- a/addons/website_sale_delivery_mondialrelay/views/delivery_carrier_views.xml
+++ b/addons/website_sale_mondialrelay/views/delivery_carrier_views.xml
@@ -1,7 +1,7 @@
-
- delivery.carrier.view.search.inherit.website.sale.delivery.mondial.relay
+
+ delivery.carrier.view.search.inherit.website.sale.mondialrelay
delivery.carrier
diff --git a/addons/website_sale_delivery_mondialrelay/views/res_config_settings_views.xml b/addons/website_sale_mondialrelay/views/res_config_settings_views.xml
similarity index 84%
rename from addons/website_sale_delivery_mondialrelay/views/res_config_settings_views.xml
rename to addons/website_sale_mondialrelay/views/res_config_settings_views.xml
index 8af5bd5c552..8fa40fc4473 100644
--- a/addons/website_sale_delivery_mondialrelay/views/res_config_settings_views.xml
+++ b/addons/website_sale_mondialrelay/views/res_config_settings_views.xml
@@ -1,7 +1,7 @@
-
- res.config.settings.view.form.inherit.website.sale.delivery.mondial.relay
+
+ res.config.settings.view.form.inherit.website.sale.mondialrelay
res.config.settings
diff --git a/addons/website_sale_delivery_mondialrelay/views/templates.xml b/addons/website_sale_mondialrelay/views/templates.xml
similarity index 56%
rename from addons/website_sale_delivery_mondialrelay/views/templates.xml
rename to addons/website_sale_mondialrelay/views/templates.xml
index 20f674950f0..b3392046dd3 100644
--- a/addons/website_sale_delivery_mondialrelay/views/templates.xml
+++ b/addons/website_sale_mondialrelay/views/templates.xml
@@ -1,23 +1,23 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/addons/website_sale_picking/__manifest__.py b/addons/website_sale_picking/__manifest__.py
index 3bc09b01795..e0ce09933c3 100644
--- a/addons/website_sale_picking/__manifest__.py
+++ b/addons/website_sale_picking/__manifest__.py
@@ -8,7 +8,7 @@
'description': """
Allows customers to pay for their orders at a shop, instead of paying online.
""",
- 'depends': ['website_sale_delivery', 'payment_custom'],
+ 'depends': ['website_sale', 'payment_custom'],
'data': [
'data/website_sale_picking_data.xml',
'views/res_config_settings_views.xml',
diff --git a/addons/website_sale_picking/views/templates.xml b/addons/website_sale_picking/views/templates.xml
index e42cd0ead21..c9c214937fa 100644
--- a/addons/website_sale_picking/views/templates.xml
+++ b/addons/website_sale_picking/views/templates.xml
@@ -1,6 +1,6 @@
-
+
delivery.delivery_type