Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git in…

…to develop
Dolibarr · Aug 9, 2013 · ff4ebe4 · ff4ebe4
2 parents 59c1f54 + ee107a6
commit ff4ebe4
Show file tree

Hide file tree

Showing 68 changed files with 2,084 additions and 887 deletions.
diff --git 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
@@ -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.= '<option value="'.$row['rowid'].'" selected="selected">';
                     }
                     else
-                    {
+					{
                         $out.= '<option value="'.$row['rowid'].'">';
                     }
                     $out.= dol_trunc($row['label'],$maxlength,'middle');
@@ -518,7 +518,7 @@ function select_country($selected='',$htmlname='country_id',$htmloption='',$maxl
             $out.= '</select>';
         }
         else
-        {
+		{
             dol_print_error($this->db);
         }