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

fix sql

Browse Source
This commit is contained in:
Florian HENRY 2021-10-08 13:17:09 +02:00
parent 0d47797be7
commit 5d393f201c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/html.formcompany.class.php
View File

@ -700,8 +700,18 @@ class FormCompany extends Form
return $socid; return $socid;
} else { } else {
// Search to list thirdparties // Search to list thirdparties
$sql = "SELECT s.rowid, s.nom as name FROM"; $sql = "SELECT s.rowid, s.nom as name ";
$sql .= " ".MAIN_DB_PREFIX."societe as s"; if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
$sql .= ", s.code_client, s.code_fournisseur";
}
if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
$sql .= ", s.address, s.zip, s.town";
$sql .= ", dictp.code as country_code";
}
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid = s.fk_pays";
}
$sql .= " WHERE s.entity IN (".getEntity('societe').")"; $sql .= " WHERE s.entity IN (".getEntity('societe').")";
// For ajax search we limit here. For combo list, we limit later // For ajax search we limit here. For combo list, we limit later
if (is_array($limitto) && count($limitto)) { if (is_array($limitto) && count($limitto)) {