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

Merge pull request #18024 from frederic34/patch-11

Browse Source 
fix warnings in propal list
This commit is contained in:
Laurent Destailleur 2021-06-26 12:19:17 +02:00 committed by GitHub
commit eb6415c374
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/societe/class/societe.class.php
View File

@ -2294,6 +2294,7 @@ class Societe extends CommonObject
$reparray = array();
$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.office_phone, u.job, u.email, u.statut as status, u.entity, u.photo, u.gender";
$sql .= ", u.office_fax, u.user_mobile, u.personal_mobile";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
@ -2324,6 +2325,10 @@ class Societe extends CommonObject
$reparray[$i]['firstname'] = $obj->firstname;
$reparray[$i]['email'] = $obj->email;
$reparray[$i]['phone'] = $obj->office_phone;
$reparray[$i]['office_phone'] = $obj->office_phone;
$reparray[$i]['office_fax'] = $obj->office_fax;
$reparray[$i]['user_mobile'] = $obj->user_mobile;
$reparray[$i]['personal_mobile'] = $obj->personal_mobile;
$reparray[$i]['job'] = $obj->job;
$reparray[$i]['statut'] = $obj->status; // deprecated
$reparray[$i]['status'] = $obj->status;