From a2d9804f78fcb1c5932c33ae3d45f6ae22640532 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 23 Jul 2007 21:28:07 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Pb=20sur=20gestion=20des=20colonnes=20ca?=
 =?UTF-8?q?ch=E9es=20region=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/admin/dict.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index bb25f6fbe91..0ae24a7f5a2 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -283,10 +283,10 @@ if ($_POST["actionadd"] || $_POST["actionmodify"])
 
 		dolibarr_syslog("dict actionmodify sql=".$sql);
 		//print $sql;
-        $result = $db->query($sql);
-        if (!$result)
+        $resql = $db->query($sql);
+        if (! $resql)
         {
-        	dolibarr_print_error($db);
+        	$msg=$db->error();
         }
     }
 
@@ -400,6 +400,7 @@ if ($_GET["id"])
 	//print $sql;
     
     $fieldlist=split(',',$tabfield[$_GET["id"]]);
+
     print '<form action="dict.php" method="post">';
     print '<table class="noborder" width="100%">';
 
@@ -423,7 +424,7 @@ if ($_GET["id"])
             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')         $valuetoshow=$langs->trans("Label")."*"; 
+            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=MENTION_NPR;
@@ -480,7 +481,7 @@ if ($_GET["id"])
                 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')         { $valuetoshow=$langs->trans("Label")."*";  }
+                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=MENTION_NPR; }
@@ -511,7 +512,7 @@ if ($_GET["id"])
                 	print '<form action="dict.php" method="post">';
                 	print '<input type="hidden" name="id" value="'.$_GET["id"].'">';
                 	print '<input type="hidden" name="rowid" value="'.$_GET["rowid"].'">';
-                	fieldList($fieldlist);
+					fieldList($fieldlist);
 					print '<td colspan="3" align="right"><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'"></td>';
                 }
                 else
@@ -614,6 +615,7 @@ llxFooter('$Date$ - $Revision$');
 function fieldList($fieldlist)
 {
 	global $conf,$langs,$db,$obj;
+	global $region_id;
 	
 	$html = new Form($db);