From c44c2c9f4ea90cab7d4e3a8cd24b06d6c97b7075 Mon Sep 17 00:00:00 2001 From: bMancone Date: Wed, 18 Apr 2012 09:24:43 +0000 Subject: [PATCH] // Fixed prefixes for the product_shop table git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14715 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminPPreferencesController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php index 270bacb08..6e5079a71 100644 --- a/controllers/admin/AdminPPreferencesController.php +++ b/controllers/admin/AdminPPreferencesController.php @@ -246,7 +246,7 @@ class AdminPPreferencesControllerCore extends AdminController if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') == 1 && (int)Tools::getValue('PS_ADVANCED_STOCK_MANAGEMENT') == 0) { - ObjectModel::updateMultishopTable('Product', array('advanced_stock_management' => 0), 'a.`advanced_stock_management` = 1'); + ObjectModel::updateMultishopTable('Product', array('advanced_stock_management' => 0), 'product_shop.`advanced_stock_management` = 1'); Db::getInstance()->execute( 'UPDATE `'._DB_PREFIX_.'stock_available` @@ -270,7 +270,7 @@ class AdminPPreferencesControllerCore extends AdminController array( 'advanced_stock_management' => $advanced_stock_management ), - '`advanced_stock_management` = '.($advanced_stock_management == 1 ? 0 : 1).' + 'product_shop.`advanced_stock_management` = '.($advanced_stock_management == 1 ? 0 : 1).' AND `cache_is_pack` = 0 AND `is_virtual` = 0' ); @@ -288,8 +288,8 @@ class AdminPPreferencesControllerCore extends AdminController `'._DB_PREFIX_.'product_shop` product_shop ON ( - product_shop.`cache_is_pack` = 0 - AND product_shop.`is_virtual` = 0 + p.`cache_is_pack` = 0 + AND p.`is_virtual` = 0 AND product_shop.`advanced_stock_management` = '.$advanced_stock_management.' ) SET s.`depends_on_stock` = '.$advanced_stock_management.',