Merge branch '3.1-beta' of git@github.com:Dolibarr/dolibarr.git into 3.1-beta
This commit is contained in:
commit
06e4a76132
@ -750,14 +750,17 @@ if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY))
|
|||||||
{
|
{
|
||||||
if (GETPOST('action') == 'switchentity' && $user->admin && ! $user->entity)
|
if (GETPOST('action') == 'switchentity' && $user->admin && ! $user->entity)
|
||||||
{
|
{
|
||||||
require_once("../class/actions_multicompany.class.php");
|
$res = @dol_include_once("/multicompany/class/actions_multicompany.class.php");
|
||||||
|
|
||||||
$mc = new ActionsMulticompany($db);
|
if ($res)
|
||||||
|
|
||||||
if($mc->switchEntity(GETPOST('entity')) > 0)
|
|
||||||
{
|
{
|
||||||
Header("Location: ".DOL_URL_ROOT.'/');
|
$mc = new ActionsMulticompany($db);
|
||||||
exit;
|
|
||||||
|
if($mc->switchEntity(GETPOST('entity')) > 0)
|
||||||
|
{
|
||||||
|
Header("Location: ".DOL_URL_ROOT.'/');
|
||||||
|
exit;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user