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

Merge pull request #568 from FHenry/3.3

Browse Source 
CheckStyle
This commit is contained in:
Laurent Destailleur 2013-01-03 11:47:57 -08:00
commit 932c36e695
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/user/class/user.class.php
View File

@ -909,14 +909,14 @@ class User extends CommonObject
$this->admin = 0;
$this->nom = $contact->nom; // TODO deprecated
$this->prenom = $contact->prenom; // TODO deprecated
$this->lastname = $contact->nom;
$this->firstname = $contact->prenom;
$this->lastname = $contact->lastname;
$this->firstname = $contact->firstname;
$this->email = $contact->email;
$this->office_phone = $contact->phone_pro;
$this->office_fax = $contact->fax;
$this->user_mobile = $contact->phone_mobile;
if (empty($login)) $login=strtolower(substr($contact->prenom, 0, 4)) . strtolower(substr($contact->nom, 0, 4));
if (empty($login)) $login=strtolower(substr($contact->firstname, 0, 4)) . strtolower(substr($contact->lastname, 0, 4));
$this->login = $login;
$this->db->begin();