Delete getCountry() and select field in sql query

Delete getCountry() and select field in sql query
This commit is contained in:
dolibarr95 2018-03-21 08:53:38 +01:00 committed by GitHub
parent 9887d38589
commit 4b0eede1dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -399,6 +399,7 @@ $sql.= " s.email, s.phone, s.url, s.siren as idprof1, s.siret as idprof2, s.ape
$sql.= " s.tms as date_update, s.datec as date_creation,";
$sql.= " s.code_compta,s.code_compta_fournisseur,";
$sql.= " typent.code as typent_code,";
$sql.= " country.code as country_code,";
$sql.= " state.code_departement as state_code, state.nom as state_name,";
$sql.= " region.code_region as region_code, region.nom as region_name";
// We'll need these fields in order to filter by sale (including the case where the user can only see his prospects)
@ -1091,8 +1092,7 @@ while ($i < min($num, $limit))
}
if (! empty($arrayfields['s.phone']['checked']))
{
$tmpcode=getCountry($obj->fk_pays,2);
print "<td>".dol_print_phone($obj->phone, $tmpcode,0,$obj->rowid)."</td>\n";
print "<td>".dol_print_phone($obj->phone, $obj->country_code, 0, $obj->rowid)."</td>\n";
if (! $i) $totalarray['nbfield']++;
}
if (! empty($arrayfields['s.url']['checked']))