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

Fixing style errors.

Browse Source
This commit is contained in:
stickler-ci 2022-04-13 00:19:15 +00:00
parent 9c8d21c63a
commit 02435a616b
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/core/ajax/ajaxcompanies.php
View File

@ -50,8 +50,7 @@ dol_syslog(join(',', $_GET));
// Generation liste des societes // Generation liste des societes
if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn')) if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn')) {
{
$return_arr = array(); $return_arr = array();
// Define filter on text typed // Define filter on text typed
@ -65,12 +64,10 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON d.rowid = s.fk_departement"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON d.rowid = s.fk_departement";
$sql .= " WHERE s.entity IN (".getEntity('societe').")"; $sql .= " WHERE s.entity IN (".getEntity('societe').")";
if ($socid) if ($socid) {
{
$sql .= " AND ("; $sql .= " AND (";
// Add criteria on name/code // Add criteria on name/code
if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) // Can use index if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) { // Can use index
{
$sql .= "s.nom LIKE '".$db->escape($socid)."%'"; $sql .= "s.nom LIKE '".$db->escape($socid)."%'";
$sql .= " OR s.code_client LIKE '".$db->escape($socid)."%'"; $sql .= " OR s.code_client LIKE '".$db->escape($socid)."%'";
$sql .= " OR s.code_fournisseur LIKE '".$db->escape($socid)."%'"; $sql .= " OR s.code_fournisseur LIKE '".$db->escape($socid)."%'";
@ -87,11 +84,9 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
//dol_syslog("ajaxcompanies", LOG_DEBUG); //dol_syslog("ajaxcompanies", LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql) {
{ while ($row = $db->fetch_array($resql)) {
while ($row = $db->fetch_array($resql))
{
$label = $row['nom']; $label = $row['nom'];
if ($socid) $label = $label; if ($socid) $label = $label;
$row_array['label'] = $label; $row_array['label'] = $label;