Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

classes/stock/StockAvailable.php

@@ -305,11 +305,7 @@ class StockAvailableCore extends ObjectModel
 		if (!Validate::isUnsignedId($id_product))
 			return false;
 
-		if ($id_shop === null)
-			$id_shop = Context::getContext()->shop->id;
-
 		$existing_id = StockAvailable::getStockAvailableIdByProductId((int)$id_product, (int)$id_product_attribute, (int)$id_shop);
-
 		if ($existing_id > 0)
 		{
 			Db::getInstance()->update(

classes/webservice/WebserviceRequest.php

@@ -1289,9 +1289,8 @@ class WebserviceRequestCore
 				$check = ' WHERE ('.implode('OR', $OR).') AND `'.bqSQL($this->resourceConfiguration['fields']['id']['sqlId']).'` = '.(int)$this->urlSegment[1];
 				if (!Db::getInstance()->getValue($sql.$check))
 					$this->setError(404, 'This '.$this->resourceConfiguration['retrieveData']['className'].' ('.(int)$this->urlSegment[1].') does not exists on this shop', 131);
-				else
-					return $objects;
 			}
+			return $objects;
 		}
 		if (!count($this->errors))
 		{