From 620e03337a7bc4984b825763f178e640c51b5590 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Fri, 1 Apr 2016 06:45:46 +0200
Subject: [PATCH] Merging problem

---
 htdocs/admin/dict.php | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index a872f5b92ce..913e46af110 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -263,7 +263,44 @@ $tabfield[28]= "code,label,affect,delay,newbymonth,country_id,country";
 $tabfield[29]= "code,label,percent,position";
 $tabfield[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
 $tabfield[31]= "pcg_version,country_id,country,label";
-$tabfield[32]= "code,label,range_account,position,country";
+$tabfield[32]= "code,label,range,position,country_id,country";
+$tabfield[33]= "code,label";		
+$tabfield[34]= "code,label";		
+		
+// Nom des champs d'edition pour modification d'un enregistrement		
+$tabfieldvalue=array();		
+$tabfieldvalue[1] = "code,libelle,country";		
+$tabfieldvalue[2] = "code,libelle,region";   // "code,libelle,region"		
+$tabfieldvalue[3] = "code,libelle,country";		
+$tabfieldvalue[4] = "code,label";		
+$tabfieldvalue[5] = "code,label";		
+$tabfieldvalue[6] = "code,libelle,type,color,position";		
+$tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible";		
+$tabfieldvalue[8] = "code,libelle,country".(! empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?',position':'');		
+$tabfieldvalue[9] = "code,label,unicode";		
+$tabfieldvalue[10]= "country,code,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";		
+$tabfieldvalue[11]= "element,source,code,libelle,position";		
+$tabfieldvalue[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage,sortorder";		
+$tabfieldvalue[13]= "code,libelle,type,accountancy_code";		
+$tabfieldvalue[14]= "code,libelle,price,organization,country";		
+$tabfieldvalue[15]= "code,libelle,width,height,unit";		
+$tabfieldvalue[16]= "code,libelle,sortorder";		
+$tabfieldvalue[17]= "code,label,accountancy_code";		
+$tabfieldvalue[18]= "code,libelle,tracking";		
+$tabfieldvalue[19]= "code,libelle";		
+$tabfieldvalue[20]= "code,libelle";		
+$tabfieldvalue[21]= "code,label";		
+$tabfieldvalue[22]= "code,label";		
+$tabfieldvalue[23]= "country,taux,accountancy_code_sell,accountancy_code_buy,note";		
+$tabfieldvalue[24]= "code,label";		
+$tabfieldvalue[25]= "label,type_template,position,topic,content";		
+$tabfieldvalue[26]= "code,label,short_label";		
+$tabfieldvalue[27]= "code,libelle";		
+$tabfieldvalue[28]= "code,label,affect,delay,newbymonth,country";		
+$tabfieldvalue[29]= "code,label,percent,position";		
+$tabfieldvalue[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";		
+$tabfieldvalue[31]= "pcg_version,country,label";		
+$tabfieldvalue[32]= "code,label,range_account,position,country";
 $tabfieldvalue[33]= "code,label";
 $tabfieldvalue[34]= "code,label";