diff --git a/classes/Tools.php b/classes/Tools.php
index f5ca5a939..56e8645b5 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1523,7 +1523,7 @@ class ToolsCore
 
 		if (self::$_cache_nb_media_servers && ($id_media_server = (abs(crc32($filename)) % self::$_cache_nb_media_servers + 1)))
 			return constant('_MEDIA_SERVER_'.$id_media_server.'_');
-		return Tools::getHttpHost();
+		return Tools::getShopDomain();
 	}
 
 	public static function generateHtaccess($path = null, $rewrite_settings = null, $cache_control = null, $specific = '', $disable_multiviews = null, $medias = false, $disable_modsec = null)
diff --git a/classes/stock/StockManager.php b/classes/stock/StockManager.php
index f1d956d1d..a313da21f 100644
--- a/classes/stock/StockManager.php
+++ b/classes/stock/StockManager.php
@@ -479,8 +479,8 @@ class StockManagerCore implements StockManagerInterface
 		$query->where('o.valid = 1 OR (os.id_order_state != '.(int)Configuration::get('PS_OS_ERROR').'
 					   AND os.id_order_state != '.(int)Configuration::get('PS_OS_CANCELED').')');
 		$query->groupBy('od.id_order_detail');
-		//if (count($ids_warehouse))
-			//$query->where('od.id_warehouse IN('.implode(', ', $ids_warehouse).')');
+		if (count($ids_warehouse))
+			$query->where('od.id_warehouse IN('.implode(', ', $ids_warehouse).')');
 		$res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
 		$client_orders_qty = 0;
 		if (count($res))
@@ -658,4 +658,4 @@ class StockManagerCore implements StockManagerInterface
 		return $stocks;
 	}
 
-}
+}
\ No newline at end of file