Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-11 18:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into socialnetworks

Browse Source
This commit is contained in:
Frédéric FRANCE
2019-10-30 20:06:43 +01:00
parent 1ba9612f12 8f5b0f5d4d
commit f7747ed00a
340 changed files with 9300 additions and 6289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/user/class/user.class.php
View File

@@ -2327,9 +2327,10 @@ class User extends CommonObject
$label.= '<div class="centpercent">';
$label.= '<u>' . $langs->trans("User") . '</u><br>';
$label.= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs, '');
if (! empty($this->login))
$label.= '<br><b>' . $langs->trans('Login') . ':</b> ' . $this->login;
$label.= '<br><b>' . $langs->trans("EMail").':</b> '.$this->email;
if (! empty($this->login)) $label.= '<br><b>' . $langs->trans('Login') . ':</b> ' . $this->login;
if (! empty($this->job)) $label.= '<br><b>' . $langs->trans("Job").':</b> '.$this->job;
$label.= '<br><b>' . $langs->trans("Email").':</b> '.$this->email;
if (! empty($this->phone)) $label.= '<br><b>' . $langs->trans("Phone").':</b> '.$this->phone;
if (! empty($this->admin))
$label.= '<br><b>' . $langs->trans("Administrator").'</b>: '.yn($this->admin);
if (! empty($this->socid) ) // Add thirdparty for external users