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

Uniformize code

Browse Source
This commit is contained in:
Laurent Destailleur 2012-01-09 00:53:31 +01:00
parent b3f194930d
commit 2146ab0cc5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1007,7 +1007,7 @@ class Form
$out=''; $out='';
// On recherche les utilisateurs // On recherche les utilisateurs
$sql = "SELECT u.rowid, u.name, u.firstname, u.login, u.admin, u.entity"; $sql = "SELECT u.rowid, u.name as lastname, u.firstname, u.login, u.admin, u.entity";
if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity) if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
{ {
$sql.= ", e.label"; $sql.= ", e.label";
@ -1045,8 +1045,8 @@ class Form
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$userstatic->id=$obj->rowid; $userstatic->id=$obj->rowid;
$userstatic->nom=$obj->name; $userstatic->lastname=$obj->lastname;
$userstatic->prenom=$obj->firstname; $userstatic->firstname=$obj->firstname;
$disableline=0; $disableline=0;
if (is_array($enableonly) && count($enableonly) && ! in_array($obj->rowid,$enableonly)) $disableline=1; if (is_array($enableonly) && count($enableonly) && ! in_array($obj->rowid,$enableonly)) $disableline=1;