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

Fix: Sort order works with special chars.

Browse Source
This commit is contained in:
Laurent Destailleur 2013-08-08 20:06:56 +02:00
parent 6d4fa94bf1
commit bfd2d7ada2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/html.form.class.php
View File

@ -473,7 +473,7 @@ class Form
$sql = "SELECT rowid, code as code_iso, libelle as label"; $sql = "SELECT rowid, code as code_iso, libelle as label";
$sql.= " FROM ".MAIN_DB_PREFIX."c_pays"; $sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
$sql.= " WHERE active = 1"; $sql.= " WHERE active = 1";
$sql.= " ORDER BY code ASC"; //$sql.= " ORDER BY code ASC";
dol_syslog(get_class($this)."::select_country sql=".$sql); dol_syslog(get_class($this)."::select_country sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
@ -492,7 +492,7 @@ class Form
$countryArray[$i]['rowid'] = $obj->rowid; $countryArray[$i]['rowid'] = $obj->rowid;
$countryArray[$i]['code_iso'] = $obj->code_iso; $countryArray[$i]['code_iso'] = $obj->code_iso;
$countryArray[$i]['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso)!="Country".$obj->code_iso?$langs->transnoentitiesnoconv("Country".$obj->code_iso):($obj->label!='-'?$obj->label:'')); $countryArray[$i]['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso)!="Country".$obj->code_iso?$langs->transnoentitiesnoconv("Country".$obj->code_iso):($obj->label!='-'?$obj->label:''));
$label[$i] = $countryArray[$i]['label']; $label[$i] = dol_string_unaccent($countryArray[$i]['label']);
$i++; $i++;
} }
@ -507,7 +507,7 @@ class Form
$out.= '<option value="'.$row['rowid'].'" selected="selected">'; $out.= '<option value="'.$row['rowid'].'" selected="selected">';
} }
else else
{ {
$out.= '<option value="'.$row['rowid'].'">'; $out.= '<option value="'.$row['rowid'].'">';
} }
$out.= dol_trunc($row['label'],$maxlength,'middle'); $out.= dol_trunc($row['label'],$maxlength,'middle');
@ -518,7 +518,7 @@ class Form
$out.= '</select>'; $out.= '</select>';
} }
else else
{ {
dol_print_error($this->db); dol_print_error($this->db);
} }