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

Merge pull request #4010 from atm-alexis/3.8_FIX_Allow_to_search_on_alias_name

Browse Source 
FIX 3.8 allow to search on alias name into select
This commit is contained in:
Laurent Destailleur 2015-11-16 23:48:18 +01:00
commit 508b11733a
1 changed files with 5 additions and 1 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

@ -891,7 +891,7 @@ class Form
$outarray=array(); $outarray=array();
// On recherche les societes // On recherche les societes
$sql = "SELECT s.rowid, s.nom as name, s.client, s.fournisseur, s.code_client, s.code_fournisseur"; $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
$sql.= " FROM ".MAIN_DB_PREFIX ."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX ."societe as s";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")"; $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
@ -967,6 +967,10 @@ class Form
$label=$obj->name; $label=$obj->name;
} }
if(!empty($obj->name_alias)) {
$label.=' ('.$obj->name_alias.')';
}
if ($showtype) if ($showtype)
{ {
if ($obj->client || $obj->fournisseur) $label.=' ('; if ($obj->client || $obj->fournisseur) $label.=' (';