dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix lot of multishop bugs (updateAssoShop reworked, remove multishop property for country / zone / currency / carrier, getList())

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15386 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-05-18 14:54:37 +00:00
parent 13c6eec6fd
commit a37dbc1e44
10 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminEmployeesController.php
+2 -3
View File
@@ -405,9 +405,8 @@ class AdminEmployeesControllerCore extends AdminController
return false;
}
$assos = $this->getAssoShop($this->table);
if (count($assos[0]) == 0 && $this->table = 'employee')
$assos = $this->getSelectedAssoShop($this->table);
if (!$assos && $this->table = 'employee')
if (Shop::isFeatureActive() && _PS_ADMIN_PROFILE_ != $_POST['id_profile'])
$this->errors[] = Tools::displayError('The employee must be associated with at least one shop');
}