From e095ebccd38bdb1977ecba1b00fb6810ace142ac Mon Sep 17 00:00:00 2001 From: dSevere Date: Tue, 22 Nov 2011 12:57:09 +0000 Subject: [PATCH] // Stock Available : bug fix git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10408 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/stock/StockAvailable.php | 2 +- controllers/admin/AdminProductsController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/stock/StockAvailable.php b/classes/stock/StockAvailable.php index f5ee3fda1..4e4c28790 100644 --- a/classes/stock/StockAvailable.php +++ b/classes/stock/StockAvailable.php @@ -392,7 +392,7 @@ class StockAvailableCore extends ObjectModel * @param int $id_shop Optional : gets context if null @see Context::getContext() * @return bool : depends on stock @see $depends_on_stock */ - public function outOfStock($id_product, $id_shop = null) + public static function outOfStock($id_product, $id_shop = null) { if (is_null($id_shop)) $id_shop = Context::getContext()->shop->getID(true); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 2b4f23e7e..2c0677c88 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3219,7 +3219,7 @@ class AdminProductsController extends AdminController if (Tools::getValue('id_product_attribute') === false) return Tools::jsonEncode(array('error' => 'Undefined id product attribute')); // @todo : Product class should handle that - $stock_available = new StockAvailable(StockAvailable::getIdStockAvailableByProductId($product->id, (int)Tools::getValue('id_product_attribute'))); + $stock_available = new StockAvailable(StockAvailable::getStockAvailableIdByProductId($product->id, (int)Tools::getValue('id_product_attribute'))); if (!$stock_available->id) { $stock_available->id_product = $product->id;