diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 9bb42f2ea5f..02553f43d27 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -76,25 +76,25 @@ $tabname[18]= MAIN_DB_PREFIX."c_shipment_mode";
 $tabname[19]= MAIN_DB_PREFIX."c_effectif";
 
 // Dictionary labels
-$tablib[1] = $langs->trans("DictionnaryCompanyJuridicalType");
-$tablib[2] = $langs->trans("DictionnaryCanton");
-$tablib[3] = $langs->trans("DictionnaryRegion");
-$tablib[4] = $langs->trans("DictionnaryCountry");
-$tablib[5] = $langs->trans("DictionnaryCivility");
-$tablib[6] = $langs->trans("DictionnaryActions");
-$tablib[7] = $langs->trans("DictionnarySocialContributions");
-$tablib[8] = $langs->trans("DictionnaryCompanyType");
-$tablib[9] = $langs->trans("DictionnaryCurrency");
-$tablib[10]= $langs->trans("DictionnaryVAT");
-$tablib[11]= $langs->trans("DictionnaryTypeContact");
-$tablib[12]= $langs->trans("DictionnaryPaymentConditions");
-$tablib[13]= $langs->trans("DictionnaryPaymentModes");
-$tablib[14]= $langs->trans("DictionnaryEcotaxe");
-$tablib[15]= $langs->trans("DictionnaryPaperFormat");
-$tablib[16]= $langs->trans("DictionnaryProspectLevel");
-$tablib[17]= $langs->trans("DictionnaryFees");
-$tablib[18]= $langs->trans("DictionnarySendingMethods");
-$tablib[19]= $langs->trans("DictionnaryStaff");
+$tablib[1] = "DictionnaryCompanyJuridicalType";
+$tablib[2] = "DictionnaryCanton";
+$tablib[3] = "DictionnaryRegion";
+$tablib[4] = "DictionnaryCountry";
+$tablib[5] = "DictionnaryCivility";
+$tablib[6] = "DictionnaryActions";
+$tablib[7] = "DictionnarySocialContributions";
+$tablib[8] = "DictionnaryCompanyType";
+$tablib[9] = "DictionnaryCurrency";
+$tablib[10]= "DictionnaryVAT";
+$tablib[11]= "DictionnaryTypeContact";
+$tablib[12]= "DictionnaryPaymentConditions";
+$tablib[13]= "DictionnaryPaymentModes";
+$tablib[14]= "DictionnaryEcotaxe";
+$tablib[15]= "DictionnaryPaperFormat";
+$tablib[16]= "DictionnaryProspectLevel";
+$tablib[17]= "DictionnaryFees";
+$tablib[18]= "DictionnarySendingMethods";
+$tablib[19]= "DictionnaryStaff";
 
 // Requete pour extraction des donnees des dictionnaires
 $tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, p.code as pays_code, p.libelle as pays, f.active FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_pays as p WHERE f.fk_pays=p.rowid";
@@ -263,203 +263,203 @@ $pagenext = $page + 1;
  */
 if ($_POST["actionadd"] || $_POST["actionmodify"])
 {
-	$listfield=explode(',',$tabfield[$_POST["id"]]);
-	$listfieldinsert=explode(',',$tabfieldinsert[$_POST["id"]]);
-	$listfieldmodify=explode(',',$tabfieldinsert[$_POST["id"]]);
-	$listfieldvalue=explode(',',$tabfieldvalue[$_POST["id"]]);
+    $listfield=explode(',',$tabfield[$_POST["id"]]);
+    $listfieldinsert=explode(',',$tabfieldinsert[$_POST["id"]]);
+    $listfieldmodify=explode(',',$tabfieldinsert[$_POST["id"]]);
+    $listfieldvalue=explode(',',$tabfieldvalue[$_POST["id"]]);
 
-	// Check that all fields are filled
-	$ok=1;
-	foreach ($listfield as $f => $value)
-	{
-		if ($value == 'pays')
-		{
-			if (in_array('region_id',$listfield)) { continue; }		// For region page, we do not require the country input
-		}
-		if ((! isset($_POST[$value]) || $_POST[$value]=='')
-		&& $listfield[$f] != 'decalage')   // Fields that are not mandatory
-		{
-			$ok=0;
-			$fieldnamekey=$listfield[$f];
-			// We take translate key of field
+    // Check that all fields are filled
+    $ok=1;
+    foreach ($listfield as $f => $value)
+    {
+        if ($value == 'pays')
+        {
+            if (in_array('region_id',$listfield)) { continue; }		// For region page, we do not require the country input
+        }
+        if ((! isset($_POST[$value]) || $_POST[$value]=='')
+        && $listfield[$f] != 'decalage')   // Fields that are not mandatory
+        {
+            $ok=0;
+            $fieldnamekey=$listfield[$f];
+            // We take translate key of field
             if ($fieldnamekey == 'libelle') $fieldnamekey='Label';
-			if ($fieldnamekey == 'nbjour') $fieldnamekey='NbOfDays';
+            if ($fieldnamekey == 'nbjour') $fieldnamekey='NbOfDays';
             if ($fieldnamekey == 'decalage') $fieldnamekey='Offset';
-			$msg.=$langs->trans("ErrorFieldRequired",$langs->transnoentities($fieldnamekey)).'<br>';
-		}
-	}
-	// Autres verif
-	if (isset($_POST["code"]) && $_POST["code"]=='0') {
-		$ok=0;
-		$msg.="Code can't contains value 0<br>";
-	}
-	if (isset($_POST["pays"]) && $_POST["pays"]=='0') {
-		$ok=0;
-		$msg.=$langs->trans("ErrorFieldRequired",$langs->trans("Country")).'<br>';
-	}
+            $msg.=$langs->trans("ErrorFieldRequired",$langs->transnoentities($fieldnamekey)).'<br>';
+        }
+    }
+    // Autres verif
+    if (isset($_POST["code"]) && $_POST["code"]=='0') {
+        $ok=0;
+        $msg.="Code can't contains value 0<br>";
+    }
+    if (isset($_POST["pays"]) && $_POST["pays"]=='0') {
+        $ok=0;
+        $msg.=$langs->trans("ErrorFieldRequired",$langs->trans("Country")).'<br>';
+    }
 
-	// Si verif ok et action add, on ajoute la ligne
-	if ($ok && $_POST["actionadd"])
-	{
-		if ($tabrowid[$_POST["id"]])
-		{
-			// Recupere id libre pour insertion
-			$newid=0;
-			$sql = "SELECT max(".$tabrowid[$_POST["id"]].") newid from ".$tabname[$_POST["id"]];
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$obj = $db->fetch_object($result);
-				$newid=($obj->newid + 1);
+    // Si verif ok et action add, on ajoute la ligne
+    if ($ok && $_POST["actionadd"])
+    {
+        if ($tabrowid[$_POST["id"]])
+        {
+            // Recupere id libre pour insertion
+            $newid=0;
+            $sql = "SELECT max(".$tabrowid[$_POST["id"]].") newid from ".$tabname[$_POST["id"]];
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $obj = $db->fetch_object($result);
+                $newid=($obj->newid + 1);
 
-			} else {
-				dol_print_error($db);
-			}
-		}
+            } else {
+                dol_print_error($db);
+            }
+        }
 
-		// Add new entry
-		$sql = "INSERT INTO ".$tabname[$_POST["id"]]." (";
-		// List of fields
-		if ($tabrowid[$_POST["id"]] &&
-		! in_array($tabrowid[$_POST["id"]],$listfieldinsert)) $sql.= $tabrowid[$_POST["id"]].",";
-		$sql.= $tabfieldinsert[$_POST["id"]];
-		$sql.=",active)";
-		$sql.= " VALUES(";
-		// List of values
-		if ($tabrowid[$_POST["id"]] &&
-		! in_array($tabrowid[$_POST["id"]],$listfieldinsert)) $sql.= $newid.",";
-		$i=0;
-		foreach ($listfieldinsert as $f => $value)
-		{
-			if ($value == 'price') { $_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU'); }
-			if ($i) $sql.=",";
-			if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";
-			else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-			$i++;
-		}
-		$sql.=",1)";
-
-		dol_syslog("actionadd sql=".$sql);
-		$result = $db->query($sql);
-		if ($result)	// Add is ok
-		{
-			$oldid=$_POST["id"];
-			$_POST=array('id'=>$oldid);	// Clean $_POST array, we keep only
-			$_GET["id"]=$_POST["id"];   // Force affichage dictionnaire en cours d'edition
-		}
-		else
-		{
-			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-				$msg=$langs->trans("ErrorRecordAlreadyExists").'<br>';
-			}
-			else {
-				dol_print_error($db);
-			}
-		}
-	}
-
-	// Si verif ok et action modify, on modifie la ligne
-	if ($ok && $_POST["actionmodify"])
-	{
-		if ($tabrowid[$_POST["id"]]) { $rowidcol=$tabrowid[$_POST["id"]]; }
-		else { $rowidcol="rowid"; }
-
-		// Modify entry
-		$sql = "UPDATE ".$tabname[$_POST["id"]]." SET ";
-		// Modifie valeur des champs
-		if ($tabrowid[$_POST["id"]] && !in_array($tabrowid[$_POST["id"]],$listfieldmodify))
-		{
-			$sql.= $tabrowid[$_POST["id"]]."=";
-			$sql.= "'".addslashes($_POST["rowid"])."', ";
-		}
-		$i = 0;
-		foreach ($listfieldmodify as $field)
-		{
-			if ($field == 'price') { $_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU'); }
-			if ($i) $sql.=",";
-			$sql.= $field."=";
+        // Add new entry
+        $sql = "INSERT INTO ".$tabname[$_POST["id"]]." (";
+        // List of fields
+        if ($tabrowid[$_POST["id"]] &&
+        ! in_array($tabrowid[$_POST["id"]],$listfieldinsert)) $sql.= $tabrowid[$_POST["id"]].",";
+        $sql.= $tabfieldinsert[$_POST["id"]];
+        $sql.=",active)";
+        $sql.= " VALUES(";
+        // List of values
+        if ($tabrowid[$_POST["id"]] &&
+        ! in_array($tabrowid[$_POST["id"]],$listfieldinsert)) $sql.= $newid.",";
+        $i=0;
+        foreach ($listfieldinsert as $f => $value)
+        {
+            if ($value == 'price') { $_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU'); }
+            if ($i) $sql.=",";
             if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";
             else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-			$i++;
-		}
-		$sql.= " WHERE ".$rowidcol." = '".$_POST["rowid"]."'";
+            $i++;
+        }
+        $sql.=",1)";
 
-		dol_syslog("actionmodify sql=".$sql);
-		//print $sql;
-		$resql = $db->query($sql);
-		if (! $resql)
-		{
-			$msg=$db->error();
-		}
-	}
+        dol_syslog("actionadd sql=".$sql);
+        $result = $db->query($sql);
+        if ($result)	// Add is ok
+        {
+            $oldid=$_POST["id"];
+            $_POST=array('id'=>$oldid);	// Clean $_POST array, we keep only
+            $_GET["id"]=$_POST["id"];   // Force affichage dictionnaire en cours d'edition
+        }
+        else
+        {
+            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+                $msg=$langs->trans("ErrorRecordAlreadyExists").'<br>';
+            }
+            else {
+                dol_print_error($db);
+            }
+        }
+    }
 
-	if ($msg) $msg='<div class="error">'.$msg.'</div>';
-	$_GET["id"]=$_POST["id"];       // Force affichage dictionnaire en cours d'edition
+    // Si verif ok et action modify, on modifie la ligne
+    if ($ok && $_POST["actionmodify"])
+    {
+        if ($tabrowid[$_POST["id"]]) { $rowidcol=$tabrowid[$_POST["id"]]; }
+        else { $rowidcol="rowid"; }
+
+        // Modify entry
+        $sql = "UPDATE ".$tabname[$_POST["id"]]." SET ";
+        // Modifie valeur des champs
+        if ($tabrowid[$_POST["id"]] && !in_array($tabrowid[$_POST["id"]],$listfieldmodify))
+        {
+            $sql.= $tabrowid[$_POST["id"]]."=";
+            $sql.= "'".addslashes($_POST["rowid"])."', ";
+        }
+        $i = 0;
+        foreach ($listfieldmodify as $field)
+        {
+            if ($field == 'price') { $_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU'); }
+            if ($i) $sql.=",";
+            $sql.= $field."=";
+            if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.= " WHERE ".$rowidcol." = '".$_POST["rowid"]."'";
+
+        dol_syslog("actionmodify sql=".$sql);
+        //print $sql;
+        $resql = $db->query($sql);
+        if (! $resql)
+        {
+            $msg=$db->error();
+        }
+    }
+
+    if ($msg) $msg='<div class="error">'.$msg.'</div>';
+    $_GET["id"]=$_POST["id"];       // Force affichage dictionnaire en cours d'edition
 }
 
 if ($_POST["actioncancel"])
 {
-	$_GET["id"]=$_POST["id"];       // Force affichage dictionnaire en cours d'edition
+    $_GET["id"]=$_POST["id"];       // Force affichage dictionnaire en cours d'edition
 }
 
 if ($_REQUEST['action'] == 'confirm_delete' && $_REQUEST['confirm'] == 'yes')       // delete
 {
-	if ($tabrowid[$_GET["id"]]) { $rowidcol=$tabrowid[$_GET["id"]]; }
-	else { $rowidcol="rowid"; }
+    if ($tabrowid[$_GET["id"]]) { $rowidcol=$tabrowid[$_GET["id"]]; }
+    else { $rowidcol="rowid"; }
 
-	$sql = "DELETE from ".$tabname[$_GET["id"]]." WHERE ".$rowidcol."='".$_GET["rowid"]."'";
+    $sql = "DELETE from ".$tabname[$_GET["id"]]." WHERE ".$rowidcol."='".$_GET["rowid"]."'";
 
-	dol_syslog("delete sql=".$sql);
-	$result = $db->query($sql);
-	if (! $result)
-	{
-		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-		{
-			$msg='<div class="error">'.$langs->trans("ErrorRecordIsUsedByChild").'</div>';
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
+    dol_syslog("delete sql=".$sql);
+    $result = $db->query($sql);
+    if (! $result)
+    {
+        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+        {
+            $msg='<div class="error">'.$langs->trans("ErrorRecordIsUsedByChild").'</div>';
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
 }
 
 if ($_GET["action"] == $acts[0])       // activate
 {
-	if ($tabrowid[$_GET["id"]]) { $rowidcol=$tabrowid[$_GET["id"]]; }
-	else { $rowidcol="rowid"; }
+    if ($tabrowid[$_GET["id"]]) { $rowidcol=$tabrowid[$_GET["id"]]; }
+    else { $rowidcol="rowid"; }
 
-	if ($_GET["rowid"]) {
-		$sql = "UPDATE ".$tabname[$_GET["id"]]." SET active = 1 WHERE ".$rowidcol."='".$_GET["rowid"]."'";
-	}
-	elseif ($_GET["code"]) {
-		$sql = "UPDATE ".$tabname[$_GET["id"]]." SET active = 1 WHERE code='".$_GET["code"]."'";
-	}
+    if ($_GET["rowid"]) {
+        $sql = "UPDATE ".$tabname[$_GET["id"]]." SET active = 1 WHERE ".$rowidcol."='".$_GET["rowid"]."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$_GET["id"]]." SET active = 1 WHERE code='".$_GET["code"]."'";
+    }
 
-	$result = $db->query($sql);
-	if (!$result)
-	{
-		dol_print_error($db);
-	}
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
 }
 
 if ($_GET["action"] == $acts[1])       // disable
 {
-	if ($tabrowid[$_GET["id"]]) { $rowidcol=$tabrowid[$_GET["id"]]; }
-	else { $rowidcol="rowid"; }
+    if ($tabrowid[$_GET["id"]]) { $rowidcol=$tabrowid[$_GET["id"]]; }
+    else { $rowidcol="rowid"; }
 
-	if ($_GET["rowid"]) {
-		$sql = "UPDATE ".$tabname[$_GET["id"]]." SET active = 0 WHERE ".$rowidcol."='".$_GET["rowid"]."'";
-	}
-	elseif ($_GET["code"]) {
-		$sql = "UPDATE ".$tabname[$_GET["id"]]." SET active = 0 WHERE code='".$_GET["code"]."'";
-	}
+    if ($_GET["rowid"]) {
+        $sql = "UPDATE ".$tabname[$_GET["id"]]." SET active = 0 WHERE ".$rowidcol."='".$_GET["rowid"]."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$_GET["id"]]." SET active = 0 WHERE code='".$_GET["code"]."'";
+    }
 
-	$result = $db->query($sql);
-	if (!$result)
-	{
-		dol_print_error($db);
-	}
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
 }
 
 
@@ -476,15 +476,15 @@ $titre=$langs->trans("DictionnarySetup");
 $linkback='';
 if ($_GET["id"])
 {
-	$titre.=' - '.$tablib[$_GET["id"]];
-	$linkback='<a href="'.DOL_URL_ROOT.'/admin/dict.php">'.$langs->trans("BackToDictionnaryList").'</a>';
+    $titre.=' - '.$langs->trans($tablib[$_GET["id"]]);
+    $linkback='<a href="'.DOL_URL_ROOT.'/admin/dict.php">'.$langs->trans("BackToDictionnaryList").'</a>';
 }
 print_fiche_titre($titre,$linkback,'setup');
 
 if (empty($_GET["id"]))
 {
-	print $langs->trans("DictionnaryDesc");
-	print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+    print $langs->trans("DictionnaryDesc");
+    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
 }
 print "<br>\n";
 
@@ -494,8 +494,8 @@ print "<br>\n";
  */
 if ($_GET['action'] == 'delete')
 {
-	$ret=$html->form_confirm($_SERVER["PHP_SELF"].'?sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$_GET["rowid"].'&code='.$_GET["code"].'&id='.$_GET["id"], $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
-	if ($ret == 'html') print '<br>';
+    $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$_GET["rowid"].'&code='.$_GET["code"].'&id='.$_GET["id"], $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+    if ($ret == 'html') print '<br>';
 }
 
 /*
@@ -503,317 +503,317 @@ if ($_GET['action'] == 'delete')
  */
 if ($_GET["id"])
 {
-	if ($msg)
-	{
-		print $msg.'<br>';
-	}
+    if ($msg)
+    {
+        print $msg.'<br>';
+    }
 
-	// Complete requete recherche valeurs avec critere de tri
-	$sql=$tabsql[$_GET["id"]];
-	if ($_GET["sortfield"])
-	{
-		// If sort order is "pays", we use pays_code instead
-		if ($_GET["sortfield"] == 'pays') $_GET["sortfield"]='pays_code';
-		$sql.= " ORDER BY ".$_GET["sortfield"];
-		if ($_GET["sortorder"])
-		{
-			$sql.=" ".strtoupper($_GET["sortorder"]);
-		}
-		$sql.=", ";
-		// Remove from default sort order the choosed order
-		$tabsqlsort[$_GET["id"]]=preg_replace('/'.$_GET["sortfield"].' '.$_GET["sortorder"].',/i','',$tabsqlsort[$_GET["id"]]);
-		$tabsqlsort[$_GET["id"]]=preg_replace('/'.$_GET["sortfield"].',/i','',$tabsqlsort[$_GET["id"]]);
-	}
-	else {
-		$sql.=" ORDER BY ";
-	}
-	$sql.=$tabsqlsort[$_GET["id"]];
-	//print $sql;
+    // Complete requete recherche valeurs avec critere de tri
+    $sql=$tabsql[$_GET["id"]];
+    if ($_GET["sortfield"])
+    {
+        // If sort order is "pays", we use pays_code instead
+        if ($_GET["sortfield"] == 'pays') $_GET["sortfield"]='pays_code';
+        $sql.= " ORDER BY ".$_GET["sortfield"];
+        if ($_GET["sortorder"])
+        {
+            $sql.=" ".strtoupper($_GET["sortorder"]);
+        }
+        $sql.=", ";
+        // Remove from default sort order the choosed order
+        $tabsqlsort[$_GET["id"]]=preg_replace('/'.$_GET["sortfield"].' '.$_GET["sortorder"].',/i','',$tabsqlsort[$_GET["id"]]);
+        $tabsqlsort[$_GET["id"]]=preg_replace('/'.$_GET["sortfield"].',/i','',$tabsqlsort[$_GET["id"]]);
+    }
+    else {
+        $sql.=" ORDER BY ";
+    }
+    $sql.=$tabsqlsort[$_GET["id"]];
+    //print $sql;
 
-	$fieldlist=explode(',',$tabfield[$_GET["id"]]);
+    $fieldlist=explode(',',$tabfield[$_GET["id"]]);
 
-	print '<form action="dict.php" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder" width="100%">';
+    print '<form action="dict.php" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder" width="100%">';
 
-	// Form to add a new line
-	if ($tabname[$_GET["id"]])
-	{
-		$alabelisused=0;
-		$var=false;
+    // Form to add a new line
+    if ($tabname[$_GET["id"]])
+    {
+        $alabelisused=0;
+        $var=false;
 
-		$fieldlist=explode(',',$tabfield[$_GET["id"]]);
-		//        print '<table class="noborder" width="100%">';
+        $fieldlist=explode(',',$tabfield[$_GET["id"]]);
+        //        print '<table class="noborder" width="100%">';
 
-		// Line for title
-		print '<tr class="liste_titre">';
-		foreach ($fieldlist as $field => $value)
-		{
-			// Determine le nom du champ par rapport aux noms possibles
-			// dans les dictionnaires de donnees
-			$valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
-			if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
-			if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
+        // Line for title
+        print '<tr class="liste_titre">';
+        foreach ($fieldlist as $field => $value)
+        {
+            // Determine le nom du champ par rapport aux noms possibles
+            // dans les dictionnaires de donnees
+            $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
+            if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
+            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
             if ($fieldlist[$field]=='taux')            { $valuetoshow=$langs->trans("Rate"); }
-			if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
-			if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
-			if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
-			if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
-			if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label")."*"; }
-			if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
-			if ($fieldlist[$field]=='pays')            {
-				if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
-				$valuetoshow=$langs->trans("Country"); }
-			if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=MAIN_LABEL_MENTION_NPR; }
-			if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
-			if ($fieldlist[$field]=='fdm')             { $valuetoshow=$langs->trans("AtEndOfMonth"); }
-			if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
-			if ($fieldlist[$field]=='width')           { $valuetoshow=$langs->trans("Width"); }
-			if ($fieldlist[$field]=='height')          { $valuetoshow=$langs->trans("Height"); }
-			if ($fieldlist[$field]=='unit')            { $valuetoshow=$langs->trans("MeasuringUnit"); }
-			if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='pays_id') { $valuetoshow=''; }
+            if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
+            if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
+            if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label")."*"; }
+            if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
+            if ($fieldlist[$field]=='pays')            {
+                if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
+                $valuetoshow=$langs->trans("Country"); }
+                if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=MAIN_LABEL_MENTION_NPR; }
+                if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
+                if ($fieldlist[$field]=='fdm')             { $valuetoshow=$langs->trans("AtEndOfMonth"); }
+                if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
+                if ($fieldlist[$field]=='width')           { $valuetoshow=$langs->trans("Width"); }
+                if ($fieldlist[$field]=='height')          { $valuetoshow=$langs->trans("Height"); }
+                if ($fieldlist[$field]=='unit')            { $valuetoshow=$langs->trans("MeasuringUnit"); }
+                if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='pays_id') { $valuetoshow=''; }
 
-			if ($valuetoshow != '')
-			{
-				print '<td>';
-				print $valuetoshow;
-				print '</td>';
-			}
+                if ($valuetoshow != '')
+                {
+                    print '<td>';
+                    print $valuetoshow;
+                    print '</td>';
+                }
 
-			if ($fieldlist[$field]=='libelle') $alabelisused=1;
-		}
-		print '<td colspan="3">';
-		print '<input type="hidden" name="id" value="'.$_GET["id"].'">';
-		print '&nbsp;</td>';
-		print '</tr>';
+                if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
+        }
+        print '<td colspan="3">';
+        print '<input type="hidden" name="id" value="'.$_GET["id"].'">';
+        print '&nbsp;</td>';
+        print '</tr>';
 
-		// Line to type new values
-		print "<tr ".$bc[$var].">";
+        // Line to type new values
+        print "<tr ".$bc[$var].">";
 
-		$obj='';
-		// If data was already input, we define them in obj to populate input fields.
-		if ($_POST["actionadd"])
-		{
-			foreach ($fieldlist as $key=>$val)
-			{
-				if (! empty($_POST[$val])) $obj->$val=$_POST[$val];
+        $obj='';
+        // If data was already input, we define them in obj to populate input fields.
+        if ($_POST["actionadd"])
+        {
+            foreach ($fieldlist as $key=>$val)
+            {
+                if (! empty($_POST[$val])) $obj->$val=$_POST[$val];
 
-			}
-		}
+            }
+        }
 
-		fieldList($fieldlist,$obj);
+        fieldList($fieldlist,$obj);
 
-		print '<td colspan="3" align="right"><input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'"></td>';
-		print "</tr>";
+        print '<td colspan="3" align="right"><input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'"></td>';
+        print "</tr>";
 
-		if ($alabelisused)  // Si un des champs est un libelle
-		{
-			print '<tr><td colspan="'.(count($fieldlist)+2).'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
-		}
-		print '<tr><td colspan="'.(count($fieldlist)+2).'">&nbsp;</td></tr>';
-	}
+        if ($alabelisused)  // Si un des champs est un libelle
+        {
+            print '<tr><td colspan="'.(count($fieldlist)+2).'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
+        }
+        print '<tr><td colspan="'.(count($fieldlist)+2).'">&nbsp;</td></tr>';
+    }
 
 
-	// List of available values in database
-	dol_syslog("htdocs/admin/dict sql=".$sql, LOG_DEBUG);
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-		$var=true;
-		if ($num)
-		{
-			// Ligne de titre
-			print '<tr class="liste_titre">';
-			foreach ($fieldlist as $field => $value)
-			{
-				// Determine le nom du champ par rapport aux noms possibles
-				// dans les dictionnaires de donnees
-				$showfield=1;							  	// Par defaut
-				$valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
-				if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
-				if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
+    // List of available values in database
+    dol_syslog("htdocs/admin/dict sql=".$sql, LOG_DEBUG);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+        $var=true;
+        if ($num)
+        {
+            // Ligne de titre
+            print '<tr class="liste_titre">';
+            foreach ($fieldlist as $field => $value)
+            {
+                // Determine le nom du champ par rapport aux noms possibles
+                // dans les dictionnaires de donnees
+                $showfield=1;							  	// Par defaut
+                $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
+                if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
+                if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
                 if ($fieldlist[$field]=='taux')            { $valuetoshow=$langs->trans("Rate"); }
-				if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
-				if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
-				if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
-				if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
-				if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label")."*";  }
-				if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
-				if ($fieldlist[$field]=='pays')            { $valuetoshow=$langs->trans("Country"); }
-				if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=MAIN_LABEL_MENTION_NPR; }
-				if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
-				if ($fieldlist[$field]=='fdm')             { $valuetoshow=$langs->trans("AtEndOfMonth"); }
-				if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
-				if ($fieldlist[$field]=='width')           { $valuetoshow=$langs->trans("Width"); }
-				if ($fieldlist[$field]=='height')          { $valuetoshow=$langs->trans("Height"); }
-				if ($fieldlist[$field]=='unit')            { $valuetoshow=$langs->trans("MeasuringUnit"); }
-				if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='pays_id') { $showfield=0; }
+                if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
+                if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
+                if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+                if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+                if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label")."*";  }
+                if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
+                if ($fieldlist[$field]=='pays')            { $valuetoshow=$langs->trans("Country"); }
+                if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=MAIN_LABEL_MENTION_NPR; }
+                if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
+                if ($fieldlist[$field]=='fdm')             { $valuetoshow=$langs->trans("AtEndOfMonth"); }
+                if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
+                if ($fieldlist[$field]=='width')           { $valuetoshow=$langs->trans("Width"); }
+                if ($fieldlist[$field]=='height')          { $valuetoshow=$langs->trans("Height"); }
+                if ($fieldlist[$field]=='unit')            { $valuetoshow=$langs->trans("MeasuringUnit"); }
+                if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='pays_id') { $showfield=0; }
 
-				// Affiche nom du champ
-				if ($showfield)
-				{
-					print_liste_field_titre($valuetoshow,"dict.php",$fieldlist[$field],"&id=".$_GET["id"],"","",$sortfield,$sortorder);
-				}
-			}
-			print_liste_field_titre($langs->trans("Status"),"dict.php","active","&id=".$_GET["id"],"",'align="center"',$sortfield,$sortorder);
-			print '<td colspan="2"  class="liste_titre">&nbsp;</td>';
-			print '</tr>';
+                // Affiche nom du champ
+                if ($showfield)
+                {
+                    print_liste_field_titre($valuetoshow,"dict.php",$fieldlist[$field],"&id=".$_GET["id"],"","",$sortfield,$sortorder);
+                }
+            }
+            print_liste_field_titre($langs->trans("Status"),"dict.php","active","&id=".$_GET["id"],"",'align="center"',$sortfield,$sortorder);
+            print '<td colspan="2"  class="liste_titre">&nbsp;</td>';
+            print '</tr>';
 
-			// Lines with values
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($resql);
-				$var=!$var;
-				//print_r($obj);
-				print "<tr $bc[$var]>";
-				if ($_GET["action"] == 'modify' && ($_GET["rowid"] == ($obj->rowid?$obj->rowid:$obj->code)))
-				{
-					print '<form action="dict.php" method="post">';
-					print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-					print '<input type="hidden" name="id" value="'.$_GET["id"].'">';
-					print '<input type="hidden" name="rowid" value="'.$_GET["rowid"].'">';
-					fieldList($fieldlist,$obj);
-					print '<td colspan="3" align="right"><a name="'.($obj->rowid?$obj->rowid:$obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-					print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
-				}
-				else
-				{
-					foreach ($fieldlist as $field => $value)
-					{
-						$showfield=1;
-						$valuetoshow=$obj->$fieldlist[$field];
-						if ($valuetoshow=='all') {
-							$valuetoshow=$langs->trans('All');
-						}
-						else if ($fieldlist[$field]=='pays') {
-							if (empty($obj->pays_code))
-							{
-								$valuetoshow='-';
-							}
-							else
-							{
-								$key=$langs->trans("Country".strtoupper($obj->pays_code));
-								$valuetoshow=($key != "Country".strtoupper($obj->pays_code))?$obj->pays_code." - ".$key:$obj->pays;
-							}
-						}
-						else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field]=='fdm') {
-							$valuetoshow=yn($valuetoshow);
-						}
-						else if ($fieldlist[$field]=='price') {
-							$valuetoshow=price($valuetoshow);
-						}
-						else if ($fieldlist[$field]=='price') {
-							$valuetoshow=price($valuetoshow);
-						}
+            // Lines with values
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+                $var=!$var;
+                //print_r($obj);
+                print "<tr $bc[$var]>";
+                if ($_GET["action"] == 'modify' && ($_GET["rowid"] == ($obj->rowid?$obj->rowid:$obj->code)))
+                {
+                    print '<form action="dict.php" method="post">';
+                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    print '<input type="hidden" name="id" value="'.$_GET["id"].'">';
+                    print '<input type="hidden" name="rowid" value="'.$_GET["rowid"].'">';
+                    fieldList($fieldlist,$obj);
+                    print '<td colspan="3" align="right"><a name="'.($obj->rowid?$obj->rowid:$obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+                    print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
+                }
+                else
+                {
+                    foreach ($fieldlist as $field => $value)
+                    {
+                        $showfield=1;
+                        $valuetoshow=$obj->$fieldlist[$field];
+                        if ($valuetoshow=='all') {
+                            $valuetoshow=$langs->trans('All');
+                        }
+                        else if ($fieldlist[$field]=='pays') {
+                            if (empty($obj->pays_code))
+                            {
+                                $valuetoshow='-';
+                            }
+                            else
+                            {
+                                $key=$langs->trans("Country".strtoupper($obj->pays_code));
+                                $valuetoshow=($key != "Country".strtoupper($obj->pays_code))?$obj->pays_code." - ".$key:$obj->pays;
+                            }
+                        }
+                        else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field]=='fdm') {
+                            $valuetoshow=yn($valuetoshow);
+                        }
+                        else if ($fieldlist[$field]=='price') {
+                            $valuetoshow=price($valuetoshow);
+                        }
+                        else if ($fieldlist[$field]=='price') {
+                            $valuetoshow=price($valuetoshow);
+                        }
                         else if ($fieldlist[$field]=='libelle_facture') {
                             $valuetoshow=nl2br($valuetoshow);
                         }
-						else if ($fieldlist[$field]=='libelle' && $tabname[$_GET["id"]]=='llx_c_pays') {
-							$key=$langs->trans("Country".strtoupper($obj->code));
-							$valuetoshow=($obj->code && $key != "Country".strtoupper($obj->code))?$key:$obj->$fieldlist[$field];
-						}
-						else if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='pays_id') {
-							$showfield=0;
-						}
-						if ($showfield) print '<td>'.$valuetoshow.'</td>';
-					}
+                        else if ($fieldlist[$field]=='libelle' && $tabname[$_GET["id"]]=='llx_c_pays') {
+                            $key=$langs->trans("Country".strtoupper($obj->code));
+                            $valuetoshow=($obj->code && $key != "Country".strtoupper($obj->code))?$key:$obj->$fieldlist[$field];
+                        }
+                        else if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='pays_id') {
+                            $showfield=0;
+                        }
+                        if ($showfield) print '<td>'.$valuetoshow.'</td>';
+                    }
 
-					print '<td align="center" nowrap="nowrap">';
-					// Est-ce une entree du dictionnaire qui peut etre desactivee ?
-					$iserasable=1;  // Oui par defaut
-					if (isset($obj->code) && ($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) $iserasable=0;
-					if (isset($obj->code) && $obj->code == 'RECEP') $iserasable=0;
-					if (isset($obj->code) && $obj->code == 'EF0') $iserasable=0;
-					if ($obj->type && $obj->type == 'system') $iserasable=0;
+                    print '<td align="center" nowrap="nowrap">';
+                    // Est-ce une entree du dictionnaire qui peut etre desactivee ?
+                    $iserasable=1;  // Oui par defaut
+                    if (isset($obj->code) && ($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) $iserasable=0;
+                    if (isset($obj->code) && $obj->code == 'RECEP') $iserasable=0;
+                    if (isset($obj->code) && $obj->code == 'EF0') $iserasable=0;
+                    if ($obj->type && $obj->type == 'system') $iserasable=0;
 
-					if ($iserasable) {
-						print '<a href="'."dict.php".'?sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.($obj->rowid?$obj->rowid:$obj->code).'&amp;code='.$obj->code.'&amp;id='.$_GET["id"].'&amp;action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-					} else {
-						print $langs->trans("AlwaysActive");
-					}
-					print "</td>";
+                    if ($iserasable) {
+                        print '<a href="'."dict.php".'?sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.($obj->rowid?$obj->rowid:$obj->code).'&amp;code='.$obj->code.'&amp;id='.$_GET["id"].'&amp;action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                    } else {
+                        print $langs->trans("AlwaysActive");
+                    }
+                    print "</td>";
 
-					// Modify link
-					if ($iserasable) {
-						print '<td align="center"><a href="dict.php?sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.($obj->rowid?$obj->rowid:$obj->code).'&amp;code='.$obj->code.'&amp;id='.$_GET["id"].'&amp;action=modify#'.($obj->rowid?$obj->rowid:$obj->code).'">'.img_edit().'</a></td>';
-					} else {
-						print '<td>&nbsp;</td>';
-					}
-					// Delete link
-					if ($iserasable) {
-						print '<td align="center"><a href="dict.php?sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.($obj->rowid?$obj->rowid:$obj->code).'&amp;code='.$obj->code.'&amp;id='.$_GET["id"].'&amp;action=delete">'.img_delete().'</a></td>';
-					} else {
-						print '<td>&nbsp;</td>';
-					}
-					print "</tr>\n";
-				}
-				$i++;
-			}
-		}
-	}
-	else {
-		dol_print_error($db);
-	}
+                    // Modify link
+                    if ($iserasable) {
+                        print '<td align="center"><a href="dict.php?sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.($obj->rowid?$obj->rowid:$obj->code).'&amp;code='.$obj->code.'&amp;id='.$_GET["id"].'&amp;action=modify#'.($obj->rowid?$obj->rowid:$obj->code).'">'.img_edit().'</a></td>';
+                    } else {
+                        print '<td>&nbsp;</td>';
+                    }
+                    // Delete link
+                    if ($iserasable) {
+                        print '<td align="center"><a href="dict.php?sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.($obj->rowid?$obj->rowid:$obj->code).'&amp;code='.$obj->code.'&amp;id='.$_GET["id"].'&amp;action=delete">'.img_delete().'</a></td>';
+                    } else {
+                        print '<td>&nbsp;</td>';
+                    }
+                    print "</tr>\n";
+                }
+                $i++;
+            }
+        }
+    }
+    else {
+        dol_print_error($db);
+    }
 
-	print '</table>';
+    print '</table>';
 
-	print '</form>';
+    print '</form>';
 }
 else
 {
-	/*
-	 * Show list of dictionnary to show
-	 */
+    /*
+     * Show list of dictionnary to show
+     */
 
-	$var=true;
-	$lastlineisempty=false;
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	//print '<td>'.$langs->trans("Module").'</td>';
-	print '<td colspan="2">'.$langs->trans("Dictionnary").'</td>';
-	print '<td>'.$langs->trans("Table").'</td>';
-	print '</tr>';
+    $var=true;
+    $lastlineisempty=false;
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    //print '<td>'.$langs->trans("Module").'</td>';
+    print '<td colspan="2">'.$langs->trans("Dictionnary").'</td>';
+    print '<td>'.$langs->trans("Table").'</td>';
+    print '</tr>';
 
-	foreach ($taborder as $i)
-	{
-	    if ($tabname[$i] && empty($tabcond[$i])) continue;
+    foreach ($taborder as $i)
+    {
+        if ($tabname[$i] && empty($tabcond[$i])) continue;
 
-		if ($i)
-		{
-			$var=!$var;
-			$value=$tabname[$i];
-			print '<tr '.$bc[$var].'><td width="30%">';
+        if ($i)
+        {
+            $var=!$var;
+            $value=$tabname[$i];
+            print '<tr '.$bc[$var].'><td width="30%">';
             if (! empty($tabcond[$i]))
             {
-			 print '<a href="dict.php?id='.$i.'">'.$tablib[$i].'</a>';
+                print '<a href="dict.php?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
             }
             else
             {
-             print $tablib[$i];
+                print $langs->trans($tablib[$i]);
             }
-			print '</td>';
+            print '</td>';
             print '<td>';
             /*if (empty($tabcond[$i]))
-            {
-              print info_admin($langs->trans("DictionnaryDisabledSinceNoModuleNeedIt"),1);
-            }*/
+             {
+             print info_admin($langs->trans("DictionnaryDisabledSinceNoModuleNeedIt"),1);
+             }*/
             print '</td>';
-			print '<td>'.$tabname[$i].'</td></tr>';
-			$lastlineisempty=false;
-		}
-		else
-		{
-			if (! $lastlineisempty)
-			{
-				$var=!$var;
-				print '<tr '.$bc[$var].'><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
-				$lastlineisempty=true;
-			}
-		}
-	}
-	print '</table>';
+            print '<td>'.$tabname[$i].'</td></tr>';
+            $lastlineisempty=false;
+        }
+        else
+        {
+            if (! $lastlineisempty)
+            {
+                $var=!$var;
+                print '<tr '.$bc[$var].'><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+                $lastlineisempty=true;
+            }
+        }
+    }
+    print '</table>';
 }
 
 print '<br>';
@@ -830,51 +830,51 @@ llxFooter('$Date$ - $Revision$');
  */
 function fieldList($fieldlist,$obj='')
 {
-	global $conf,$langs,$db;
-	global $region_id;
+    global $conf,$langs,$db;
+    global $region_id;
 
-	$html = new Form($db);
-	$formadmin = new FormAdmin($db);
-	$formcompany = new FormCompany($db);
+    $html = new Form($db);
+    $formadmin = new FormAdmin($db);
+    $formcompany = new FormCompany($db);
 
-	foreach ($fieldlist as $field => $value)
-	{
-		//var_dump($obj);
-		if ($fieldlist[$field] == 'pays') {
-			if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; }	// For region page, we do not show the country input
-			print '<td>';
-			$html->select_pays($obj->pays,'pays');
-			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'pays_id') {
-			$pays_id = (! empty($obj->$fieldlist[$field])) ? $obj->$fieldlist[$field] : 0;
-			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$pays_id.'">';
-		}
-		elseif ($fieldlist[$field] == 'region') {
-			print '<td>';
-			$formcompany->select_region($region_id,'region');
-			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'region_id') {
-			$region_id = $obj->$fieldlist[$field]?$obj->$fieldlist[$field]:0;
-			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
-		}
-		elseif ($fieldlist[$field] == 'lang') {
-			print '<td>';
-			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
-			print '</td>';
-		}
-		// Le type de l'element (pour les type de contact).'
-		elseif ($fieldlist[$field] == 'element')
-		{
-			$langs->load("orders");
-			$langs->load("contracts");
-			$langs->load("project");
-			$langs->load("propal");
-			$langs->load("bills");
-			$langs->load("interventions");
-			print '<td>';
-			$elementList = array("commande"=>$langs->trans("Order"),
+    foreach ($fieldlist as $field => $value)
+    {
+        //var_dump($obj);
+        if ($fieldlist[$field] == 'pays') {
+            if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; }	// For region page, we do not show the country input
+            print '<td>';
+            $html->select_pays($obj->pays,'pays');
+            print '</td>';
+        }
+        elseif ($fieldlist[$field] == 'pays_id') {
+            $pays_id = (! empty($obj->$fieldlist[$field])) ? $obj->$fieldlist[$field] : 0;
+            print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$pays_id.'">';
+        }
+        elseif ($fieldlist[$field] == 'region') {
+            print '<td>';
+            $formcompany->select_region($region_id,'region');
+            print '</td>';
+        }
+        elseif ($fieldlist[$field] == 'region_id') {
+            $region_id = $obj->$fieldlist[$field]?$obj->$fieldlist[$field]:0;
+            print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
+        }
+        elseif ($fieldlist[$field] == 'lang') {
+            print '<td>';
+            print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
+            print '</td>';
+        }
+        // Le type de l'element (pour les type de contact).'
+        elseif ($fieldlist[$field] == 'element')
+        {
+            $langs->load("orders");
+            $langs->load("contracts");
+            $langs->load("project");
+            $langs->load("propal");
+            $langs->load("bills");
+            $langs->load("interventions");
+            print '<td>';
+            $elementList = array("commande"=>$langs->trans("Order"),
 			"order_supplier"=>$langs->trans("SupplierOrder"),
 			"contrat"=>$langs->trans("Contract"),
 			"project"=>$langs->trans("Project"),
@@ -883,53 +883,53 @@ function fieldList($fieldlist,$obj='')
 			"facture"=>$langs->trans("Bill"),
 			"facture_fourn"=>$langs->trans("SupplierBill"),
 			"fichinter"=>$langs->trans("InterventionCard"));
-			print $html->selectarray('element', $elementList,$obj->$fieldlist[$field]);
-			print '</td>';
-		}
-		// La source de l'element (pour les type de contact).'
-		elseif ($fieldlist[$field] == 'source')
-		{
-			print '<td>';
-			$elementList = array("internal"=>$langs->trans("Internal"),
+            print $html->selectarray('element', $elementList,$obj->$fieldlist[$field]);
+            print '</td>';
+        }
+        // La source de l'element (pour les type de contact).'
+        elseif ($fieldlist[$field] == 'source')
+        {
+            print '<td>';
+            $elementList = array("internal"=>$langs->trans("Internal"),
 			"external"=>$langs->trans("External"));
-			print $html->selectarray('source', $elementList,$obj->$fieldlist[$field]);
-			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'type' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX."c_actioncomm")
-		{
-			print '<td>';
-			print 'user<input type="hidden" name="type" value="user">';
-			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm') {
-			print '<td>';
-			print $html->selectyesno($fieldlist[$field],$obj->$fieldlist[$field],1);
-			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'nbjour' || $fieldlist[$field] == 'decalage' || $fieldlist[$field] == 'taux') {
-			print '<td><input type="text" class="flat" value="'.$obj->$fieldlist[$field].'" size="3" name="'.$fieldlist[$field].'"></td>';
-		}
+            print $html->selectarray('source', $elementList,$obj->$fieldlist[$field]);
+            print '</td>';
+        }
+        elseif ($fieldlist[$field] == 'type' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX."c_actioncomm")
+        {
+            print '<td>';
+            print 'user<input type="hidden" name="type" value="user">';
+            print '</td>';
+        }
+        elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm') {
+            print '<td>';
+            print $html->selectyesno($fieldlist[$field],$obj->$fieldlist[$field],1);
+            print '</td>';
+        }
+        elseif ($fieldlist[$field] == 'nbjour' || $fieldlist[$field] == 'decalage' || $fieldlist[$field] == 'taux') {
+            print '<td><input type="text" class="flat" value="'.$obj->$fieldlist[$field].'" size="3" name="'.$fieldlist[$field].'"></td>';
+        }
         elseif ($fieldlist[$field] == 'libelle_facture') {
             print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.$obj->$fieldlist[$field].'</textarea></td>';
         }
-		elseif ($fieldlist[$field] == 'price') {
-			print '<td><input type="text" class="flat" value="'.price($obj->$fieldlist[$field]).'" size="8" name="'.$fieldlist[$field].'"></td>';
-		}
-		elseif ($fieldlist[$field] == 'code') {
-			print '<td><input type="text" class="flat" value="'.$obj->$fieldlist[$field].'" size="10" name="'.$fieldlist[$field].'"></td>';
-		}
-		elseif ($fieldlist[$field]=='unit') {
-			print '<td>';
-			print $html->selectarray('unit',array('mm','cm','point','inch'),$obj->$fieldlist[$field],0,0,1);
-			print '</td>';
-		}
-		else
-		{
-			print '<td>';
-			print '<input type="text" '.($fieldlist[$field]=='libelle'?'size="32" ':'').' class="flat" value="'.$obj->$fieldlist[$field].'" name="'.$fieldlist[$field].'">';
-			print '</td>';
-		}
-	}
+        elseif ($fieldlist[$field] == 'price') {
+            print '<td><input type="text" class="flat" value="'.price($obj->$fieldlist[$field]).'" size="8" name="'.$fieldlist[$field].'"></td>';
+        }
+        elseif ($fieldlist[$field] == 'code') {
+            print '<td><input type="text" class="flat" value="'.$obj->$fieldlist[$field].'" size="10" name="'.$fieldlist[$field].'"></td>';
+        }
+        elseif ($fieldlist[$field]=='unit') {
+            print '<td>';
+            print $html->selectarray('unit',array('mm','cm','point','inch'),$obj->$fieldlist[$field],0,0,1);
+            print '</td>';
+        }
+        else
+        {
+            print '<td>';
+            print '<input type="text" '.($fieldlist[$field]=='libelle'?'size="32" ':'').' class="flat" value="'.$obj->$fieldlist[$field].'" name="'.$fieldlist[$field].'">';
+            print '</td>';
+        }
+    }
 }
 
 ?>
diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php
index b8c9bf98bfa..85fb7437629 100644
--- a/htdocs/lib/admin.lib.php
+++ b/htdocs/lib/admin.lib.php
@@ -714,7 +714,7 @@ function UnActivate($value,$requiredby=1)
 /**
  *  Add external modules to list of dictionnaries
  */
-function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,$tabcond)
+function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond)
 {
     global $db, $modules, $conf, $langs;
 
@@ -782,11 +782,13 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq
                             //$objMod
                             if (! empty($objMod->dictionnaries))
                             {
-                                var_dump($tabname);
-                                var_dump($objMod->dictionnaries['tabname']);
+                                //var_dump($objMod->dictionnaries['tabname']);
                                 $taborder[] = 0;
-                                foreach($objMod->dictionnaries['tabname'] as $val) $taborder[] = sizeof($tabname)+1;
-                                foreach($objMod->dictionnaries['tabname'] as $val) $tabname[] = $val;
+                                foreach($objMod->dictionnaries['tabname'] as $val)
+                                {
+                                    $taborder[] = sizeof($tabname)+1;
+                                    $tabname[] = $val;
+                                }
                                 foreach($objMod->dictionnaries['tablib'] as $val) $tablib[] = $val;
                                 foreach($objMod->dictionnaries['tabsql'] as $val) $tabsql[] = $val;
                                 foreach($objMod->dictionnaries['tabsqlsort'] as $val) $tabsqlsort[] = $val;
@@ -797,7 +799,7 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq
                                 foreach($objMod->dictionnaries['tabcond'] as $val) $tabcond[] = $val;
                                 //                                foreach($objMod->dictionnaries['tabsqlsort'] as $val) $tablib[] = $val;
                                 //$tabname = array_merge ($tabname, $objMod->dictionnaries['tabname']);
-                                var_dump($tabname);
+                                //var_dump($tabcond);
                                 //exit;
                             }