diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index ff9632088a1..ee12d785a30 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -753,7 +753,7 @@ class FormCompany extends Form return $socid; } else { // Search to list thirdparties - $sql = "SELECT s.rowid, s.nom as name "; + $sql = "SELECT s.rowid, s.nom as name, s.name_alias"; if (getDolGlobalString('SOCIETE_ADD_REF_IN_LIST')) { $sql .= ", s.code_client, s.code_fournisseur"; } @@ -807,19 +807,20 @@ class FormCompany extends Form if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) { $disabled = 1; } + $nameAlias = !empty($obj->name_alias) ? ' (' . $obj->name_alias . ')' : ''; if ($selected > 0 && $selected == $obj->rowid) { print ''; + print ' selected>' . dol_escape_htmltag($obj->name, 0, 0, '', 0, 1) . $nameAlias . ''; $firstCompany = $obj->rowid; } else { print ''; + print '>' . dol_escape_htmltag($obj->name, 0, 0, '', 0, 1) . $nameAlias . ''; } $i++; } diff --git a/htdocs/societe/ajax/ajaxcompanies.php b/htdocs/societe/ajax/ajaxcompanies.php index 183350dec92..130d71f2b3f 100644 --- a/htdocs/societe/ajax/ajaxcompanies.php +++ b/htdocs/societe/ajax/ajaxcompanies.php @@ -159,6 +159,9 @@ if ($resql) { } $label .= $row['nom']; + if (!empty($row['name_alias'])) { + $label .= ' (' . $row['name_alias'] . ')'; + } if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) { $label .= ($row['address'] ? ' - '.$row['address'] : '').($row['zip'] ? ' - '.$row['zip'] : '').($row['town'] ? ' '.$row['town'] : '');