lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: regression (multicompany)

Browse Source
This commit is contained in:
Regis Houssin 2012-08-01 13:01:28 +02:00
parent ae6e3ad5c4
commit a2db2c5012
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.form.class.php
View File

@ -3791,7 +3791,7 @@ class Form
* @param int $force_entity Possibility to force entity * @param int $force_entity Possibility to force entity
* @return void * @return void
*/ */
function select_dolgroups($selected='',$htmlname='groupid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity='') function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity='')
{ {
global $conf,$user,$langs; global $conf,$user,$langs;

4
htdocs/user/fiche.php
View File

@ -1317,7 +1317,7 @@ else
if (! empty($groupslist)) if (! empty($groupslist))
{ {
if( ! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode)) if (! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode))
{ {
foreach($groupslist as $groupforuser) foreach($groupslist as $groupforuser)
{ {
@ -1335,7 +1335,7 @@ else
print '<table class="noborder" width="100%">'."\n"; print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("GroupsToAdd").'</th>'."\n"; print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("GroupsToAdd").'</th>'."\n";
print '<th>'; print '<th>';
print $form->select_dolgroups('','group',1,$exclude,0,'','',$fuser->entity); print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $fuser->entity);
print ' &nbsp; '; print ' &nbsp; ';
// Multicompany // Multicompany
if (! empty($conf->multicompany->enabled)) if (! empty($conf->multicompany->enabled))