diff --git a/deltatech_website_stock_location/__init__.py b/deltatech_website_stock_location/__init__.py
index 10f487e1fa..d562380ee3 100644
--- a/deltatech_website_stock_location/__init__.py
+++ b/deltatech_website_stock_location/__init__.py
@@ -3,4 +3,3 @@
 # See README.rst file on addons root folder for license details
 
 from . import models
-from . import controllers
diff --git a/deltatech_website_stock_location/__manifest__.py b/deltatech_website_stock_location/__manifest__.py
index fd8f72628a..18204a0cf1 100644
--- a/deltatech_website_stock_location/__manifest__.py
+++ b/deltatech_website_stock_location/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "eCommerce Stock location",
     "category": "Website",
     "summary": "Stock Availability From Location",
-    "version": "15.0.1.0.1",
+    "version": "15.0.1.0.2",
     "author": "Terrabit, Dorin Hongu",
     "website": "https://www.terrabit.ro",
     "depends": ["website", "website_sale_stock"],
diff --git a/deltatech_website_stock_location/controllers/__init__.py b/deltatech_website_stock_location/controllers/__init__.py
deleted file mode 100644
index 308f04edce..0000000000
--- a/deltatech_website_stock_location/controllers/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# ©  2015-2022 Deltatech
-#              Dorin Hongu <dhongu(@)gmail(.)com
-# See README.rst file on addons root folder for license details
-
-
-from . import main
diff --git a/deltatech_website_stock_location/controllers/main.py b/deltatech_website_stock_location/controllers/main.py
deleted file mode 100644
index 85ae787e44..0000000000
--- a/deltatech_website_stock_location/controllers/main.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# ©  2015-2022 Deltatech
-#              Dorin Hongu <dhongu(@)gmail(.)com
-# See README.rst file on addons root folder for license details
-
-
-from odoo import http
-from odoo.http import request
-
-from odoo.addons.website_sale.controllers import main as website_sale_controller
-
-
-class WebsiteSale(website_sale_controller.WebsiteSale):
-    @http.route()
-    def shop(self, page=0, category=None, search="", ppg=False, **post):
-
-        current_website = request.env["website"].get_current_website()
-        request.context = dict(
-            request.context, warehouse=current_website.warehouse_id, location=current_website.location_id.id
-        )
-
-        if not current_website.warehouse_id:
-            request.context = dict(request.context, all_warehouses=True)
-        if not current_website.location_id:
-            request.context = dict(request.context, all_locations=True)
-
-        response = super(WebsiteSale, self).shop(page, category, search, ppg, **post)
-
-        return response
-
-
-class PaymentPortal(website_sale_controller.PaymentPortal):
-    @http.route()
-    def shop_payment_transaction(self, *args, **kwargs):
-        current_website = request.env["website"].get_current_website()
-        request.context = dict(
-            request.context, warehouse=current_website.warehouse_id, location=current_website.location_id.id
-        )
-        if not current_website.warehouse_id:
-            request.context = dict(request.context, all_warehouses=True)
-        if not current_website.location_id:
-            request.context = dict(request.context, all_locations=True)
-        return super().shop_payment_transaction(*args, **kwargs)
diff --git a/deltatech_website_stock_location/models/__init__.py b/deltatech_website_stock_location/models/__init__.py
index 75cbf4bd63..4306b356f7 100644
--- a/deltatech_website_stock_location/models/__init__.py
+++ b/deltatech_website_stock_location/models/__init__.py
@@ -5,3 +5,4 @@
 from . import product
 from . import website
 from . import res_config_settings
+from . import sale_order
diff --git a/deltatech_website_stock_location/models/sale_order.py b/deltatech_website_stock_location/models/sale_order.py
new file mode 100644
index 0000000000..ccd8876c01
--- /dev/null
+++ b/deltatech_website_stock_location/models/sale_order.py
@@ -0,0 +1,18 @@
+# ©  2015-2022 Deltatech
+#              Dorin Hongu <dhongu(@)gmail(.)com
+# See README.rst file on addons root folder for license details
+
+from odoo import models
+
+
+class SaleOrder(models.Model):
+    _inherit = "sale.order"
+
+    def _cart_update(self, product_id=None, line_id=None, add_qty=0, set_qty=0, **kwargs):
+        if self.website_id:
+            if not self.website_id.warehouse_id:
+                self = self.with_context(all_warehouses=True)
+            if not self.website_id.location_id:
+                self = self.with_context(all_locations=True)
+        values = super(SaleOrder, self)._cart_update(product_id, line_id, add_qty, set_qty, **kwargs)
+        return values
diff --git a/deltatech_website_stock_location/models/website.py b/deltatech_website_stock_location/models/website.py
index ee76979f44..d2e5047493 100644
--- a/deltatech_website_stock_location/models/website.py
+++ b/deltatech_website_stock_location/models/website.py
@@ -16,3 +16,14 @@ def _get_warehouse_available(self):
         if not self.location_id:
             self = self.with_context(all_locations=True)
         return super(Website, self)._get_warehouse_available()
+
+    def sale_get_order(self, force_create=False, code=None, update_pricelist=False, force_pricelist=False):
+        so = super().sale_get_order(
+            force_create=force_create, code=code, update_pricelist=update_pricelist, force_pricelist=force_pricelist
+        )
+        if so and so.website_id:
+            if not so.website_id.warehouse_id:
+                so = so.with_context(all_warehouses=True)
+            if not so.website_id.location_id:
+                so = so.with_context(all_locations=True)
+        return so