// Fixed #PSTEST-837

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13535 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-02-22 15:48:46 +00:00
parent 3f894e4c1c
commit 6c57343e32
@@ -3468,7 +3468,7 @@ class AdminProductsControllerCore extends AdminController
else
{
// if quantities are shared between shops of the group, it's not possible to manage them for a given shop
if ($group_shop->share_stock)
if ($group_shop->share_stock && $group_shop->getTotalShops() > 1)
$show_quantities = false;
}
@@ -3830,7 +3830,7 @@ class AdminProductsControllerCore extends AdminController
{
$id_module = Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($this->tab_display_module).'\'');
$this->tpl_form_vars['custom_form'] = Hook::exec('displayAdminProductsExtra', array(), (int)$id_module);
}
}