diff --git a/ChangeLog b/ChangeLog index 2ea639e201159..d83555879b3d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ For users: - New: [ task #1014 ] Add option to recursivly add parent category - New: [ task #1016 ] Can define a specific numbering for deposits - New: [ task #918 ] Stock replenishment +- Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count For translators: diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 5019b2dba02ce..bef2f1465af60 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -473,7 +473,7 @@ function select_country($selected='',$htmlname='country_id',$htmloption='',$maxl $sql = "SELECT rowid, code as code_iso, libelle as label"; $sql.= " FROM ".MAIN_DB_PREFIX."c_pays"; $sql.= " WHERE active = 1"; - $sql.= " ORDER BY code ASC"; + //$sql.= " ORDER BY code ASC"; dol_syslog(get_class($this)."::select_country sql=".$sql); $resql=$this->db->query($sql); @@ -492,7 +492,7 @@ function select_country($selected='',$htmlname='country_id',$htmloption='',$maxl $countryArray[$i]['rowid'] = $obj->rowid; $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:'')); - $label[$i] = $countryArray[$i]['label']; + $label[$i] = dol_string_unaccent($countryArray[$i]['label']); $i++; } @@ -507,7 +507,7 @@ function select_country($selected='',$htmlname='country_id',$htmloption='',$maxl $out.= '