diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index a7bd7bd7eb5..35d2b136add 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -109,6 +109,8 @@ $countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst")
 
 print_fiche_titre($langs->trans("CompanyFundation"),'','setup');
 
+print $langs->trans("CompanyFundationDesc")."<br>\n";
+print "<br>\n";
 
 if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
  || (isset($_POST["action"]) && $_POST["action"] == 'updateedit') )
@@ -140,19 +142,19 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyName").'</td><td>';
-    print '<input name="nom" value="'. $conf->global->MAIN_INFO_SOCIETE_NOM . '"></td></tr>';
+    print '<input name="nom" size="30" value="'. $conf->global->MAIN_INFO_SOCIETE_NOM . '"></td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyAddress").'</td><td>';
-    print '<textarea name="address" cols="50" rows="'.ROWS_2.'">'. $conf->global->MAIN_INFO_SOCIETE_ADRESSE . '</textarea></td></tr>';
+    print '<textarea name="address" cols="60" rows="'.ROWS_3.'">'. $conf->global->MAIN_INFO_SOCIETE_ADRESSE . '</textarea></td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyZip").'</td><td>';
-    print '<input name="cp" value="'. $conf->global->MAIN_INFO_SOCIETE_CP . '"></td></tr>';
+    print '<input name="cp" value="'. $conf->global->MAIN_INFO_SOCIETE_CP . '" size="10"></td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyTown").'</td><td>';
-    print '<input name="ville" value="'. $conf->global->MAIN_INFO_SOCIETE_VILLE . '"></td></tr>';
+    print '<input name="ville" size="30" value="'. $conf->global->MAIN_INFO_SOCIETE_VILLE . '"></td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("Country").'</td><td>';
@@ -176,18 +178,18 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("Mail").'</td><td>';
-    print '<input name="mail" value="'. $conf->global->MAIN_INFO_SOCIETE_MAIL . '"></td></tr>';
+    print '<input name="mail" size="60" value="'. $conf->global->MAIN_INFO_SOCIETE_MAIL . '"></td></tr>';
     print '</td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("Web").'</td><td>';
-    print '<input name="web" value="'. $conf->global->MAIN_INFO_SOCIETE_WEB . '"></td></tr>';
+    print '<input name="web" size="60" value="'. $conf->global->MAIN_INFO_SOCIETE_WEB . '"></td></tr>';
     print '</td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("Logo").' (png,jpg)</td><td>';
     print '<table width="100%" class="notopnoleftnoright"><tr><td valign="center">';
-    print '<input type="file" class="flat" name="logo" size="30">';
+    print '<input type="file" class="flat" name="logo" size="50">';
     print '</td><td valign="middle" align="right">';
     if ($mysoc->logo && file_exists($conf->societe->dir_logos.'/'.$mysoc->logo))
     {
@@ -577,7 +579,7 @@ else
     print '<br>';
 }
 
+$db->close();
 
 llxFooter('$Date$ - $Revision$');
-
 ?>
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index ac12cdd658f..98838339b7d 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,6 +59,10 @@ llxHeader();
 
 print_fiche_titre($langs->trans("OtherSetup"),'','setup');
 
+print $langs->trans("ConstDesc")."<br>\n";
+print "<br>\n";
+
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 3ff2075d18e..6c825abc8b6 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -38,6 +38,7 @@ $langs->load("banks");
 
 if (!$user->admin)
   accessforbidden();
+  
 if ( (isset($_POST["action"]) && $_POST["action"] == 'update')
   || (isset($_POST["action"]) && $_POST["action"] == 'updateedit') )
 {
@@ -64,13 +65,12 @@ llxHeader();
 
 print_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"),'','setup');
 
+print $langs->transnoentities("DelaysOfToleranceDesc",img_warning())."<br>\n";
+print "<br>\n";
 
 $form = new Form($db);
 $countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
 
-print $langs->transnoentities("DelaysOfToleranceDesc",img_warning())."<br>\n";
-
-print "<br>\n";
 
 if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
  || (isset($_POST["action"]) && $_POST["action"] == 'updateedit') )
@@ -96,67 +96,87 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
     $var=true;
 
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td width="60%">'.$langs->trans("DolibarrWorkBoard").'</td><td>'.$langs->trans("Value").'</td></tr>';
+    print '<tr class="liste_titre"><td colspan="2" width="60%">'.$langs->trans("DolibarrWorkBoard").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	//
     if (1 == 1)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceActionsToDo").'</td><td>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','task').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceActionsToDo").'</td><td>';
         print '<input size="5" name="ActionsToDo" value="'. ($conf->global->MAIN_DELAY_ACTIONS_TODO+0) . '"> ' . $langs->trans("days") . '</td></tr>';
     }
     if ($conf->commande->enabled)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceOrdersToProcess").'</td><td>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','order').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceOrdersToProcess").'</td><td>';
         print '<input size="5" name="OrdersToProcess" value="'. ($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS+0) . '"> ' . $langs->trans("days") . '</td></tr>';
     }
     if ($conf->propal->enabled)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfTolerancePropalsToClose").'</td><td>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','propal').'</td>';
+        print '<td>'.$langs->trans("DelaysOfTolerancePropalsToClose").'</td><td>';
         print '<input size="5" name="PropalsToClose" value="'. ($conf->global->MAIN_DELAY_PROPALS_TO_CLOSE+0) . '"> ' . $langs->trans("days") . '</td></tr>';    
     }
     if ($conf->propal->enabled)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfTolerancePropalsToBill").'</td><td>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','propal').'</td>';
+        print '<td>'.$langs->trans("DelaysOfTolerancePropalsToBill").'</td><td>';
         print '<input size="5" name="PropalsToBill" value="'. ($conf->global->MAIN_DELAY_PROPALS_TO_BILL+0) . '"> ' . $langs->trans("days") . '</td></tr>';	
     }
     if ($conf->service->enabled)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceNotActivatedServices").'</td><td>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','service').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceNotActivatedServices").'</td><td>';
         print '<input size="5" name="BoardNotActivatedServices" value="'. ($conf->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES+0) . '"> ' . $langs->trans("days") . '</td></tr>';
     }
     if ($conf->service->enabled)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceRunningServices").'</td><td>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','service').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceRunningServices").'</td><td>';
         print '<input size="5" name="BoardRunningServices" value="'. ($conf->global->MAIN_DELAY_RUNNING_SERVICES +0). '"> ' . $langs->trans("days") . '</td></tr>';
     }
     if ($conf->fournisseur->enabled)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceSupplierBillsToPay").'</td><td>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','bill').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceSupplierBillsToPay").'</td><td>';
         print '<input size="5" name="SupplierBillsToPay" value="'. ($conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY+0) . '"> ' . $langs->trans("days") . '</td></tr>';
     }    
     if ($conf->facture->enabled)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceCustomerBillsUnpayed").'</td><td>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','bill').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceCustomerBillsUnpayed").'</td><td>';
         print '<input size="5" name="CustomerBillsUnpayed" value="'. ($conf->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED+0) . '"> ' . $langs->trans("days") . '</td></tr>';
     }    
     if ($conf->banque->enabled)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceTransactionsToConciliate").'</td><td>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','account').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceTransactionsToConciliate").'</td><td>';
         print '<input size="5" name="TransactionsToConciliate" value="'. ($conf->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE+0) . '"> ' . $langs->trans("days") . '</td></tr>'; 
     }
     if ($conf->adherent->enabled)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceMembers").'</td><td>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','user').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceMembers").'</td><td>';
         print '<input size="5" name="Members" value="'. ($conf->global->MAIN_DELAY_MEMBERS+0). '"> ' . $langs->trans("days") . '</td></tr>';
     }
         
@@ -175,68 +195,88 @@ else
      */
 
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td width="60%">'.$langs->trans("DolibarrWorkBoard").'</td><td>'.$langs->trans("Value").'</td></tr>';
+    print '<tr class="liste_titre"><td colspan="2" width="60%">'.$langs->trans("DolibarrWorkBoard").'</td><td>'.$langs->trans("Value").'</td></tr>';
     $var=true;
 
     $var=!$var;
 
     if (1== 1)
     {
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceActionsToDo").'</td><td>' . ($conf->global->MAIN_DELAY_ACTIONS_TODO+0) . ' ' . $langs->trans("days") . '</td></tr>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','task').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceActionsToDo").'</td><td>' . ($conf->global->MAIN_DELAY_ACTIONS_TODO+0) . ' ' . $langs->trans("days") . '</td></tr>';
     }
     
     if ($conf->commande->enabled)
     {
     	$var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceOrdersToProcess").'</td><td>' . ($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS+0) . ' ' . $langs->trans("days") . '</td></tr>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','order').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceOrdersToProcess").'</td><td>' . ($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS+0) . ' ' . $langs->trans("days") . '</td></tr>';
     }
      
     if ($conf->propal->enabled)
     {
     	$var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfTolerancePropalsToClose").'</td><td>' . ($conf->global->MAIN_DELAY_PROPALS_TO_CLOSE+0). ' ' . $langs->trans("days") . '</td></tr>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','propal').'</td>';
+        print '<td>'.$langs->trans("DelaysOfTolerancePropalsToClose").'</td><td>' . ($conf->global->MAIN_DELAY_PROPALS_TO_CLOSE+0). ' ' . $langs->trans("days") . '</td></tr>';
     }
 
     if ($conf->propal->enabled)
     {
     	$var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfTolerancePropalsToBill").'</td><td>' . ($conf->global->MAIN_DELAY_PROPALS_TO_BILL+0) . ' ' . $langs->trans("days") . '</td></tr>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','propal').'</td>';
+        print '<td>'.$langs->trans("DelaysOfTolerancePropalsToBill").'</td><td>' . ($conf->global->MAIN_DELAY_PROPALS_TO_BILL+0) . ' ' . $langs->trans("days") . '</td></tr>';
     }
 
     if ($conf->service->enabled)
     {
     	$var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceNotActivatedServices").'</td><td>' . ($conf->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES+0) . ' ' . $langs->trans("days") . '</td></tr>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','service').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceNotActivatedServices").'</td><td>' . ($conf->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES+0) . ' ' . $langs->trans("days") . '</td></tr>';
     }
     
     if ($conf->service->enabled)
     {
     	$var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceRunningServices").'</td><td>' . ($conf->global->MAIN_DELAY_RUNNING_SERVICES+0). ' ' . $langs->trans("days") . '</td></tr>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','service').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceRunningServices").'</td><td>' . ($conf->global->MAIN_DELAY_RUNNING_SERVICES+0). ' ' . $langs->trans("days") . '</td></tr>';
     }
 
     if ($conf->fournisseur->enabled)
     {
     	$var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceSupplierBillsToPay").'</td><td>' . ($conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY+0) . ' ' . $langs->trans("days") . '</td></tr>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','bill').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceSupplierBillsToPay").'</td><td>' . ($conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY+0) . ' ' . $langs->trans("days") . '</td></tr>';
     }
     
     if ($conf->facture->enabled)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceCustomerBillsUnpayed").'</td><td>' . ($conf->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED+0) . ' ' . $langs->trans("days") . '</td></tr>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','bill').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceCustomerBillsUnpayed").'</td><td>' . ($conf->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED+0) . ' ' . $langs->trans("days") . '</td></tr>';
     }
 
     if ($conf->banque->enabled)
     {
     	$var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceTransactionsToConciliate").'</td><td>' . ($conf->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE+0) . ' ' . $langs->trans("days") . '</td></tr>';    
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','account').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceTransactionsToConciliate").'</td><td>' . ($conf->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE+0) . ' ' . $langs->trans("days") . '</td></tr>';    
     }
 
     if ($conf->adherent->enabled)
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("DelaysOfToleranceMembers").'</td><td>' . ($conf->global->MAIN_DELAY_MEMBERS+0) . ' ' . $langs->trans("days") . '</td></tr>';
+        print '<tr '.$bc[$var].'>';
+        print '<td width="20px">'.img_object('','user').'</td>';
+        print '<td>'.$langs->trans("DelaysOfToleranceMembers").'</td><td>' . ($conf->global->MAIN_DELAY_MEMBERS+0) . ' ' . $langs->trans("days") . '</td></tr>';
     }
 
     print '</table>';
@@ -249,6 +289,7 @@ else
 }
 
 
-llxFooter('$Date$ - $Revision$');
+$db->close();
 
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 01b84620721..5c434c5aa1c 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -98,7 +98,7 @@ $tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FR
 $tabsql[12]= "SELECT rowid   as rowid, code, sortorder, c.libelle, c.libelle_facture, nbjour, fdm, decalage, active FROM ".MAIN_DB_PREFIX."cond_reglement AS c";
 $tabsql[13]= "SELECT id      as rowid, code, c.libelle, type, active FROM ".MAIN_DB_PREFIX."c_paiement AS c";
 
-// Tri par defaut
+// Critere de tri du dictionnaire
 $tabsqlsort[1] ="pays, code ASC";
 $tabsqlsort[2] ="pays, code ASC";
 $tabsqlsort[3] ="pays, code ASC";
@@ -158,6 +158,20 @@ $tabrowid[11]= "rowid";
 $tabrowid[12]= "rowid";
 $tabrowid[13]= "id";
 
+// Condition to show dictionnary in setup page
+$tabcond[1] = $conf->societe->enabled;
+$tabcond[2] = true;
+$tabcond[3] = true;
+$tabcond[4] = true;
+$tabcond[5] = $conf->societe->enabled;
+$tabcond[6] = true;
+$tabcond[7] = $conf->tax->enabled;
+$tabcond[8] = $conf->societe->enabled;
+$tabcond[9] = true;
+$tabcond[10]= true;
+$tabcond[11]= true;
+$tabcond[12]= $conf->facture->enabled||$conf->fournisseur->enabled;
+$tabcond[13]= $conf->facture->enabled||$conf->fournisseur->enabled;
 
 $msg='';
 
@@ -302,6 +316,15 @@ if ($_GET["action"] == $acts[1])       // disable
 
 llxHeader();
 
+$titre=$langs->trans("DictionnarySetup");
+if ($_GET["id"])
+{
+	$titre.=' - '.$tablib[$_GET["id"]];
+}
+print_fiche_titre($titre,'','setup');
+
+print $langs->trans("DictionnaryDesc")."<br>\n";
+print "<br>\n";
 
 
 /*
@@ -309,31 +332,36 @@ llxHeader();
  */
 if ($_GET["id"])
 {
-    print_fiche_titre($langs->trans("DictionnarySetup").' - '.$tablib[$_GET["id"]],'','setup');
-
     if ($msg) {
         print $msg.'<br>';
     }
 
     // Complète requete recherche valeurs avec critere de tri
     $sql=$tabsql[$_GET["id"]];
-    if ($_GET["sortfield"]) {
-        $sql .= " ORDER BY ".$_GET["sortfield"];
-        if ($_GET["sortorder"]) {
-            $sql.=" ".$_GET["sortorder"];
+    if ($_GET["sortfield"])
+    {
+        $sql.= " ORDER BY ".$_GET["sortfield"];
+        if ($_GET["sortorder"])
+        {
+            $sql.=" ".strtoupper($_GET["sortorder"]);
         }
         $sql.=", ";
+		// Remove from default sort order the choosed order
+        $tabsqlsort[$_GET["id"]]=eregi_replace($_GET["sortfield"].' '.$_GET["sortorder"].',','',$tabsqlsort[$_GET["id"]]);
+        $tabsqlsort[$_GET["id"]]=eregi_replace($_GET["sortfield"].',','',$tabsqlsort[$_GET["id"]]);
     }
     else {
         $sql.=" ORDER BY ";   
     }
     $sql.=$tabsqlsort[$_GET["id"]];
+	//print $sql;
     
     $fieldlist=split(',',$tabfield[$_GET["id"]]);
     print '<table class="noborder" width="100%">';
 
     // Ligne d'ajout
-    if ($tabname[$_GET["id"]]) {
+    if ($tabname[$_GET["id"]])
+    {
         $alabelisused=0;
         $var=false;
         
@@ -345,7 +373,8 @@ if ($_GET["id"])
 
         // Ligne de titre d'ajout
         print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value) {
+        foreach ($fieldlist as $field => $value)
+        {
             // Determine le nom du champ par rapport aux noms possibles
             // dans les dictionnaires de données
             $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
@@ -373,7 +402,8 @@ if ($_GET["id"])
         // Ligne d'ajout
         print "<tr $bc[$var] class=\"value\">";
         $html = new Form($db);
-        foreach ($fieldlist as $field => $value) {
+        foreach ($fieldlist as $field => $value)
+        {
             if ($fieldlist[$field] == 'pays') {
                 print '<td>';
                 $html->select_pays('','pays');
@@ -437,7 +467,11 @@ if ($_GET["id"])
                 $html->selectyesno('fdm','',1);
                 print '</td>';
             }
-            else {
+            elseif ($fieldlist[$field] == 'taux') {
+                print '<td><input type="text" class="flat" value="" size="3" name="'.$fieldlist[$field].'"></td>';
+            }
+            else
+            {
                 print '<td><input type="text" class="flat" value="" name="'.$fieldlist[$field].'" ></td>';
             }
         }
@@ -541,7 +575,6 @@ else
     /*
      * Affichage de la liste des dictionnaires
      */
-    print_fiche_titre($langs->trans("DictionnarySetup"),'','setup');
 
     $var=true;
     print '<table class="noborder" width="100%">';
@@ -549,6 +582,8 @@ else
 
     foreach ($taborder as $i)
     {
+        if ($tabname[$i] && ! $tabcond[$i]) continue;	// If dictionnary and condition not true
+        
         $var=!$var;
         if ($i)
         {
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 189190cf255..bc4230350b2 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -84,6 +84,9 @@ llxHeader();
 
 print_fiche_titre($langs->trans("GUISetup"),'','setup');
 
+print $langs->trans("DisplayDesc")."<br>\n";
+print "<br>\n";
+
 
 if (isset($_GET["action"]) && $_GET["action"] == 'edit')
 {
@@ -382,5 +385,7 @@ function show_theme($edit=0)
     print '</table>';
 }
 
+$db->close();
+
 llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index ed305cef4a8..bd1c76727da 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -47,6 +47,9 @@ $form = new Form($db);
 
 print_fiche_titre($langs->trans("SetupArea"),'','setup');
 
+print "<br>";
+print '<center><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo_2.png" alt="Dolibarr logo"></center><br>';
+
 if ($message) print $message.'<br>';
 
 print "<br>";
@@ -64,5 +67,7 @@ print "<br>";
     
 print '<br>';
 
+$db->close();
+
 llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index b487243cf14..07b0400b291 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -148,6 +148,12 @@ llxHeader("","");
 print_fiche_titre($langs->trans("ModulesSetup"),'','setup');
 
 
+if ($mode==0) print $langs->trans("ModulesDesc")."<br>\n";
+if ($mode==1) print $langs->trans("ModulesInterfaceDesc")."<br>\n";
+if ($mode==2) print $langs->trans("ModulesSpecialDesc")."<br>\n";
+print "<br>\n";
+
+
 $h = 0;
 
 $head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=0";
@@ -168,15 +174,8 @@ $h++;
 dolibarr_fiche_head($head, $hselected, $langs->trans("Modules"));
 
 
-if ($mode==0) print $langs->trans("ModulesDesc")."<br>\n";
-if ($mode==1) print $langs->trans("ModulesInterfaceDesc")."<br>\n";
-if ($mode==2) print $langs->trans("ModulesSpecialDesc")."<br>\n";
-
-
-
 if ($mesg) print '<div class="error">'.$mesg.'</div>';
 
-print "<br>\n";
 print "<table class=\"noborder\" width=\"100%\">\n";
 print "<tr class=\"liste_titre\">\n";
 print "  <td>".$langs->trans("Family")."</td>\n";
@@ -364,6 +363,7 @@ print "</table></div>\n";
 print '<div class="tabsAction">';
 print '</div>';
 
+$db->close();
 
 llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 0281716fec0..f1455efbbda 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -53,6 +53,9 @@ llxHeader();
 
 print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
 
+print $langs->trans("DefaultRightsDesc")."<br>\n";
+print "<br>\n";
+
 
 $h = 0;
 
@@ -65,11 +68,8 @@ $head[$h][0] = DOL_URL_ROOT."/admin/security.php";
 $head[$h][1] = $langs->trans("Passwords");
 $h++;
 
-
 dolibarr_fiche_head($head, $hselected, $langs->trans("Security"));
 
-print $langs->trans("DefaultRightsDesc")."<br><br>\n";
-
 
 print '<table class="noborder" width="100%">';
 
@@ -176,6 +176,7 @@ print '</table>';
 
 print '</div>';
 
+
 $db->close();
 
 llxFooter('$Date$ - $Revision$');
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 056b233efa8..8602704d9a7 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -59,6 +59,9 @@ llxHeader();
 
 print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
 
+print $langs->trans("GeneratedPasswordDesc")."<br>\n";
+print "<br>\n";
+
 
 $h = 0;
 
@@ -146,6 +149,7 @@ print '</form>';
 
 print '</div>';
 
-llxFooter('$Date$ - $Revision$');
+$db->close();
 
+llxFooter('$Date$ - $Revision$');
 ?>