From 154c7a9ed9f558772f07450dc4dd0fdf58ac7903 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Mon, 17 Oct 2011 12:10:18 +0000 Subject: [PATCH] // Fixed bug tab AdminEmployee git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9387 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/tabs/AdminEmployees.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/admin-dev/tabs/AdminEmployees.php b/admin-dev/tabs/AdminEmployees.php index 7b8681435..4b010dfcc 100644 --- a/admin-dev/tabs/AdminEmployees.php +++ b/admin-dev/tabs/AdminEmployees.php @@ -256,8 +256,9 @@ class AdminEmployees extends AdminTab $assos = self::getAssoShop($this->table); - if (!count($assos[0]) && $this->table = 'employee') - $this->_errors[] = Tools::displayError('The employee must be associated with at least one shop'); + if (count($assos[0]) == 0 && $this->table = 'employee') + if (Shop::isMultiShopActivated() && _PS_ADMIN_PROFILE_ != $_POST['id_profile']) + $this->_errors[] = Tools::displayError('The employee must be associated with at least one shop'); } return parent::postProcess(); }