From 3c94f30a1c40a2e43acb2a371e2169464af2fed8 Mon Sep 17 00:00:00 2001
From: eldy <eldy@destailleur.fr>
Date: Mon, 26 Sep 2011 22:53:30 +0200
Subject: [PATCH] Put accountancy code before note

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 276f2a6326c..14926154b28 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -171,7 +171,7 @@ $tabfield[7] = "code,libelle,pays_id,pays,deductible";
 $tabfield[8] = "code,libelle";
 //$tabfield[9] = "code,code_iso,libelle,symbole";
 $tabfield[9] = "code,code_iso,libelle";
-$tabfield[10]= "pays_id,pays,taux,recuperableonly,localtax1,localtax2,note,accountancy_code";
+$tabfield[10]= "pays_id,pays,taux,recuperableonly,localtax1,localtax2,accountancy_code,note";
 $tabfield[11]= "element,source,code,libelle";
 $tabfield[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
 $tabfield[13]= "code,libelle,type";
@@ -196,7 +196,7 @@ $tabfieldvalue[7] = "code,libelle,pays,deductible";
 $tabfieldvalue[8] = "code,libelle";
 //$tabfieldvalue[9] = "code,code_iso,libelle,symbole";
 $tabfieldvalue[9] = "code,code_iso,libelle";
-$tabfieldvalue[10]= "pays,taux,recuperableonly,localtax1,localtax2,note,accountancy_code";
+$tabfieldvalue[10]= "pays,taux,recuperableonly,localtax1,localtax2,accountancy_code,note";
 $tabfieldvalue[11]= "element,source,code,libelle";
 $tabfieldvalue[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
 $tabfieldvalue[13]= "code,libelle,type";
@@ -221,7 +221,7 @@ $tabfieldinsert[7] = "code,libelle,fk_pays,deductible";
 $tabfieldinsert[8] = "code,libelle";
 //$tabfieldinsert[9] = "code,code_iso,label,symbole";
 $tabfieldinsert[9] = "code,code_iso,label";
-$tabfieldinsert[10]= "fk_pays,taux,recuperableonly,localtax1,localtax2,note,accountancy_code";
+$tabfieldinsert[10]= "fk_pays,taux,recuperableonly,localtax1,localtax2,accountancy_code,note";
 $tabfieldinsert[11]= "element,source,code,libelle";
 $tabfieldinsert[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
 $tabfieldinsert[13]= "code,libelle,type";
@@ -568,10 +568,7 @@ if ($_GET['action'] == 'delete')
  */
 if ($_GET["id"])
 {
-    if ($msg)
-    {
-        print $msg.'<br>';
-    }
+    dol_htmloutput_mesg($msg);
 
     // Complete requete recherche valeurs avec critere de tri
     $sql=$tabsql[$_GET["id"]];
@@ -967,7 +964,7 @@ function fieldList($fieldlist,$obj='')
             print $html->selectyesno($fieldlist[$field],$obj->$fieldlist[$field],1);
             print '</td>';
         }
-        elseif ($fieldlist[$field] == 'nbjour' || $fieldlist[$field] == 'decalage' || $fieldlist[$field] == 'taux') {
+        elseif (in_array($fieldlist[$field],array('nbjour','decalage','taux','localtax1','localtax2'))) {
             print '<td><input type="text" class="flat" value="'.$obj->$fieldlist[$field].'" size="3" name="'.$fieldlist[$field].'"></td>';
         }
         elseif ($fieldlist[$field] == 'libelle_facture') {