Fix: more simple

This commit is contained in:
Regis Houssin 2011-03-30 16:01:53 +00:00
parent 3331c5fcd7
commit a7e640658c
3 changed files with 6 additions and 5 deletions

View File

@ -213,7 +213,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
{
$mc = new ActionsMulticompany($db);
$select_entity=$mc->select_entities($lastentity, 1, 'tabindex="3"');
$select_entity=$mc->select_entities($lastentity, 'tabindex="3"');
}
}

View File

@ -1186,12 +1186,13 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
if ($res)
{
//$mc = new ActionsMulticompany($db);
$mc = new ActionsMulticompany($db);
$mc->getInfo($conf->entity);
$entitytext = img_object('', 'globe',"class='entity'");
$entityhtmltext = 'EntityName';
$entityhtmltext = $mc->label;
print $html->textwithtooltip('',$entityhtmltext,2,1,$entitytext,'',1);
//$select_entity = '<div class="loginSelectEntity">'.$mc->select_entities($conf->entity).'</div>';
//if ($mc->numEntity >= 1) print $select_entity;
//print $select_entity;
}
}
}

View File

@ -234,7 +234,7 @@ if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY) && ! $disabled)
if ($res)
{
$mc = new ActionsMulticompany($db);
$select_entity = $mc->select_entities($lastentity,0,'tabindex="2"');
$select_entity = $mc->select_entities($lastentity,'tabindex="2"');
}
}