// Fix multishop_context

controllers/admin/AdminCurrenciesController.php

@@ -27,8 +27,6 @@
 
 class AdminCurrenciesControllerCore extends AdminController
 {
-    public $display_multishop_toolbar = false;
-
 	public function __construct()
 	{
 	 	$this->table = 'currency';
@@ -82,6 +80,8 @@ class AdminCurrenciesControllerCore extends AdminController
 			)
 		);
 		parent::__construct();
+
+		$this->multishop_context = Shop::CONTEXT_ALL;
 	}
 
 	public function renderList()

controllers/admin/AdminShopUrlController.php

@@ -27,8 +27,6 @@
 
 class AdminShopUrlControllerCore extends AdminController
 {
-	public $display_multishop_toolbar = false;
-
 	public function __construct()
 	{
 	 	$this->table = 'shop_url';
@@ -90,6 +88,8 @@ class AdminShopUrlControllerCore extends AdminController
 	 	$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
 
 		parent::__construct();
+
+		$this->multishop_context = null;
 	}
 
 	public function renderList()

controllers/admin/AdminStockConfigurationController.php

@@ -39,7 +39,6 @@ class AdminStockConfigurationControllerCore extends AdminController
 	 	$this->table = 'stock_mvt_reason';
 	 	$this->className = 'StockMvtReason';
 		$this->lang = true;
-		$this->display_multishop_toolbar = false;
 
 		// defines fields
 		$this->fieldsDisplay = array(
@@ -122,6 +121,8 @@ class AdminStockConfigurationControllerCore extends AdminController
 		);
 
 		parent::__construct();
+
+		$this->multishop_context = null;
 	}
 
 	public function init()

controllers/admin/AdminStockCoverController.php

@@ -40,7 +40,6 @@ class AdminStockCoverControllerCore extends AdminController
 		$this->className = 'Product';
 		$this->lang = true;
 		$this->colorOnBackground = true;
-		$this->display_multishop_toolbar = false;
 
 		$this->fieldsDisplay = array(
 			'reference' => array(
@@ -104,6 +103,8 @@ class AdminStockCoverControllerCore extends AdminController
 		array_unshift($this->stock_cover_warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses')));
 
 		parent::__construct();
+
+		$this->multishop_context = null;
 	}
 
 	/**

controllers/admin/AdminStockInstantStateController.php

@@ -38,7 +38,6 @@ class AdminStockInstantStateControllerCore extends AdminController
 		$this->table = 'stock';
 		$this->className = 'Stock';
 		$this->lang = false;
-		$this->display_multishop_toolbar = false;
 
 		$this->fieldsDisplay = array(
 			'reference' => array(
@@ -103,6 +102,8 @@ class AdminStockInstantStateControllerCore extends AdminController
 		array_unshift($this->stock_instant_state_warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses')));
 
 		parent::__construct();
+
+		$this->multishop_context = null;
 	}
 
 	/**

controllers/admin/AdminStockManagementController.php

@@ -36,7 +36,6 @@ class AdminStockManagementControllerCore extends AdminController
 		$this->table = 'product';
 		$this->className = 'Product';
 		$this->lang = true;
-		$this->display_multishop_toolbar = false;
 
 		$this->fieldsDisplay = array(
 			'reference' => array(
@@ -72,6 +71,8 @@ class AdminStockManagementControllerCore extends AdminController
 
 		parent::__construct();
 
+		$this->multishop_context = null;
+
 		// overrides confirmation messages specifically for this controller
 		$this->_conf = array(
 			1 => $this->l('The product was successfully added to stock'),

controllers/admin/AdminStockMvtController.php

@@ -37,7 +37,6 @@ class AdminStockMvtControllerCore extends AdminController
 	 	$this->className = 'StockMvt';
 	 	$this->identifier = 'id_stock_mvt';
 	 	$this->lang = false;
-	 	$this->display_multishop_toolbar = false;
 
 		$this->list_no_link = true;
 		$this->displayInformation($this->l('This interface allows you to display the stock movements for a selected warehouse.').'<br />');
@@ -116,6 +115,8 @@ class AdminStockMvtControllerCore extends AdminController
 		);
 
 		parent::__construct();
+
+		$this->multishop_context = null;
 	}
 
 	/**

controllers/admin/AdminSupplyOrdersController.php

@@ -44,7 +44,6 @@ class AdminSupplyOrdersControllerCore extends AdminController
 	 	$this->identifier = 'id_supply_order';
 	 	$this->lang = false;
 	 	$this->is_template_list = false;
-	 	$this->display_multishop_toolbar = false;
 
 		$this->addRowAction('updatereceipt');
 		$this->addRowAction('changestate');
@@ -114,6 +113,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
 		array_unshift($this->warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses')));
 
 		parent::__construct();
+
+		$this->multishop_context = null;
 	}
 
 	/**