diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 6fc03a62189..2e4b88c2287 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -713,12 +713,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 			continue; // For a column name 'sortorder', we use the field name 'position'
 		}
 		if ((!GETPOSTISSET($value) || GETPOST($value) == '')
-			&& (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto'))  // Fields that are not mandatory
-			&& ($id != 10 || ($listfield[$f] != 'code' && $listfield[$f] != 'note')) // Field code and note is not mandatory for dictionary table 10
+			&& (!in_array($value, array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto'))  // Fields that are not mandatory
+			&& ($id != 10 || ($value != 'code' && $value != 'note')) // Field code and note is not mandatory for dictionary table 10
 			)
 		) {
 			$ok = 0;
-			$fieldnamekey = $listfield[$f];
+			$fieldnamekey = $value;
 			// We take translate key of field
 			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
 				$fieldnamekey = 'Label';
@@ -1211,26 +1211,26 @@ if ($id) {
 		// Line for title
 		$tdsoffields = '<tr class="liste_titre">';
 		foreach ($fieldlist as $field => $value) {
-			if ($fieldlist[$field] == 'entity') {
+			if ($value == 'entity') {
 				$withentity = getEntity($tabname[$id]);
 				continue;
 			}
 
 			// Define field friendly name from its technical name
-			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+			$valuetoshow = ucfirst($value); // Par defaut
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 			$class = '';
 
-			if ($fieldlist[$field] == 'pos') {
+			if ($value == 'pos') {
 				$valuetoshow = $langs->trans("Position"); $class = 'maxwidth100';
 			}
-			if ($fieldlist[$field] == 'source') {
+			if ($value == 'source') {
 				$valuetoshow = $langs->trans("Contact");
 			}
-			if ($fieldlist[$field] == 'price') {
+			if ($value == 'price') {
 				$valuetoshow = $langs->trans("PriceUHT");
 			}
-			if ($fieldlist[$field] == 'taux') {
+			if ($value == 'taux') {
 				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") {
 					$valuetoshow = $langs->trans("Rate");
 				} else {
@@ -1238,175 +1238,175 @@ if ($id) {
 				}
 				$class = 'center';
 			}
-			if ($fieldlist[$field] == 'localtax1_type') {
+			if ($value == 'localtax1_type') {
 				$valuetoshow = $langs->trans("UseLocalTax")." 2"; $class = "center"; $sortable = 0;
 			}
-			if ($fieldlist[$field] == 'localtax1') {
+			if ($value == 'localtax1') {
 				$valuetoshow = $langs->trans("Rate")." 2"; $class = "center";
 			}
-			if ($fieldlist[$field] == 'localtax2_type') {
+			if ($value == 'localtax2_type') {
 				$valuetoshow = $langs->trans("UseLocalTax")." 3"; $class = "center"; $sortable = 0;
 			}
-			if ($fieldlist[$field] == 'localtax2') {
+			if ($value == 'localtax2') {
 				$valuetoshow = $langs->trans("Rate")." 3"; $class = "center";
 			}
-			if ($fieldlist[$field] == 'organization') {
+			if ($value == 'organization') {
 				$valuetoshow = $langs->trans("Organization");
 			}
-			if ($fieldlist[$field] == 'lang') {
+			if ($value == 'lang') {
 				$valuetoshow = $langs->trans("Language");
 			}
-			if ($fieldlist[$field] == 'type') {
+			if ($value == 'type') {
 				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") {
 					$valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
 				} else {
 					$valuetoshow = $langs->trans("Type");
 				}
 			}
-			if ($fieldlist[$field] == 'code') {
+			if ($value == 'code') {
 				$valuetoshow = $langs->trans("Code"); $class = 'maxwidth100';
 			}
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+			if ($value == 'libelle' || $value == 'label') {
 				$valuetoshow = $form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
 			}
-			if ($fieldlist[$field] == 'libelle_facture') {
+			if ($value == 'libelle_facture') {
 				$valuetoshow = $form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
 			}
-			if ($fieldlist[$field] == 'country') {
+			if ($value == 'country') {
 				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') {
+			if ($value == 'recuperableonly') {
 				$valuetoshow = $langs->trans("NPR"); $class = "center";
 			}
-			if ($fieldlist[$field] == 'nbjour') {
+			if ($value == 'nbjour') {
 				$valuetoshow = $langs->trans("NbOfDays");
 			}
-			if ($fieldlist[$field] == 'type_cdr') {
+			if ($value == 'type_cdr') {
 				$valuetoshow = $langs->trans("AtEndOfMonth"); $class = "center";
 			}
-			if ($fieldlist[$field] == 'decalage') {
+			if ($value == 'decalage') {
 				$valuetoshow = $langs->trans("Offset");
 			}
-			if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') {
+			if ($value == 'width' || $value == 'nx') {
 				$valuetoshow = $langs->trans("Width");
 			}
-			if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') {
+			if ($value == 'height' || $value == 'ny') {
 				$valuetoshow = $langs->trans("Height");
 			}
-			if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') {
+			if ($value == 'unit' || $value == 'metric') {
 				$valuetoshow = $langs->trans("MeasuringUnit");
 			}
-			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+			if ($value == 'region_id' || $value == 'country_id') {
 				$valuetoshow = '';
 			}
-			if ($fieldlist[$field] == 'accountancy_code') {
+			if ($value == 'accountancy_code') {
 				$valuetoshow = $langs->trans("AccountancyCode");
 			}
-			if ($fieldlist[$field] == 'accountancy_code_sell') {
+			if ($value == 'accountancy_code_sell') {
 				$valuetoshow = $langs->trans("AccountancyCodeSell");
 			}
-			if ($fieldlist[$field] == 'accountancy_code_buy') {
+			if ($value == 'accountancy_code_buy') {
 				$valuetoshow = $langs->trans("AccountancyCodeBuy");
 			}
-			if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') {
+			if ($value == 'pcg_version' || $value == 'fk_pcg_version') {
 				$valuetoshow = $langs->trans("Pcg_version");
 			}
-			if ($fieldlist[$field] == 'account_parent') {
+			if ($value == 'account_parent') {
 				$valuetoshow = $langs->trans("Accountparent");
 			}
-			if ($fieldlist[$field] == 'pcg_type') {
+			if ($value == 'pcg_type') {
 				$valuetoshow = $langs->trans("Pcg_type");
 			}
-			if ($fieldlist[$field] == 'pcg_subtype') {
+			if ($value == 'pcg_subtype') {
 				$valuetoshow = $langs->trans("Pcg_subtype");
 			}
-			if ($fieldlist[$field] == 'sortorder') {
+			if ($value == 'sortorder') {
 				$valuetoshow = $langs->trans("SortOrder");
 			}
-			if ($fieldlist[$field] == 'short_label') {
+			if ($value == 'short_label') {
 				$valuetoshow = $langs->trans("ShortLabel");
 			}
-			if ($fieldlist[$field] == 'range_account') {
+			if ($value == 'range_account') {
 				$valuetoshow = $langs->trans("Range");
 			}
-			if ($fieldlist[$field] == 'sens') {
+			if ($value == 'sens') {
 				$valuetoshow = $langs->trans("Sens");
 			}
-			if ($fieldlist[$field] == 'category_type') {
+			if ($value == 'category_type') {
 				$valuetoshow = $langs->trans("Calculated");
 			}
-			if ($fieldlist[$field] == 'formula') {
+			if ($value == 'formula') {
 				$valuetoshow = $langs->trans("Formula");
 			}
-			if ($fieldlist[$field] == 'paper_size') {
+			if ($value == 'paper_size') {
 				$valuetoshow = $langs->trans("PaperSize");
 			}
-			if ($fieldlist[$field] == 'orientation') {
+			if ($value == 'orientation') {
 				$valuetoshow = $langs->trans("Orientation");
 			}
-			if ($fieldlist[$field] == 'leftmargin') {
+			if ($value == 'leftmargin') {
 				$valuetoshow = $langs->trans("LeftMargin");
 			}
-			if ($fieldlist[$field] == 'topmargin') {
+			if ($value == 'topmargin') {
 				$valuetoshow = $langs->trans("TopMargin");
 			}
-			if ($fieldlist[$field] == 'spacex') {
+			if ($value == 'spacex') {
 				$valuetoshow = $langs->trans("SpaceX");
 			}
-			if ($fieldlist[$field] == 'spacey') {
+			if ($value == 'spacey') {
 				$valuetoshow = $langs->trans("SpaceY");
 			}
-			if ($fieldlist[$field] == 'font_size') {
+			if ($value == 'font_size') {
 				$valuetoshow = $langs->trans("FontSize");
 			}
-			if ($fieldlist[$field] == 'custom_x') {
+			if ($value == 'custom_x') {
 				$valuetoshow = $langs->trans("CustomX");
 			}
-			if ($fieldlist[$field] == 'custom_y') {
+			if ($value == 'custom_y') {
 				$valuetoshow = $langs->trans("CustomY");
 			}
-			if ($fieldlist[$field] == 'percent') {
+			if ($value == 'percent') {
 				$valuetoshow = $langs->trans("Percentage");
 			}
-			if ($fieldlist[$field] == 'affect') {
+			if ($value == 'affect') {
 				$valuetoshow = $langs->trans("WithCounter");
 			}
-			if ($fieldlist[$field] == 'delay') {
+			if ($value == 'delay') {
 				$valuetoshow = $langs->trans("NoticePeriod");
 			}
-			if ($fieldlist[$field] == 'newbymonth') {
+			if ($value == 'newbymonth') {
 				$valuetoshow = $langs->trans("NewByMonth");
 			}
-			if ($fieldlist[$field] == 'fk_tva') {
+			if ($value == 'fk_tva') {
 				$valuetoshow = $langs->trans("VAT");
 			}
-			if ($fieldlist[$field] == 'range_ik') {
+			if ($value == 'range_ik') {
 				$valuetoshow = $langs->trans("RangeIk");
 			}
-			if ($fieldlist[$field] == 'fk_c_exp_tax_cat') {
+			if ($value == 'fk_c_exp_tax_cat') {
 				$valuetoshow = $langs->trans("CarCategory");
 			}
-			if ($fieldlist[$field] == 'revenuestamp_type') {
+			if ($value == 'revenuestamp_type') {
 				$valuetoshow = $langs->trans('TypeOfRevenueStamp');
 			}
-			if ($fieldlist[$field] == 'use_default') {
+			if ($value == 'use_default') {
 				$valuetoshow = $langs->trans('Default'); $class = 'center';
 			}
-			if ($fieldlist[$field] == 'unit_type') {
+			if ($value == 'unit_type') {
 				$valuetoshow = $langs->trans('TypeOfUnit');
 			}
-			if ($fieldlist[$field] == 'public' && $tablib[$id] == 'TicketDictCategory') {
+			if ($value == 'public' && $tablib[$id] == 'TicketDictCategory') {
 				$valuetoshow = $langs->trans('TicketGroupIsPublic'); $class = 'center';
 			}
 
 			if ($id == 2) {	// Special case for state page
-				if ($fieldlist[$field] == 'region_id') {
+				if ($value == 'region_id') {
 					$valuetoshow = '&nbsp;'; $showfield = 1;
 				}
-				if ($fieldlist[$field] == 'region') {
+				if ($value == 'region') {
 					$valuetoshow = $langs->trans("Country").'/'.$langs->trans("Region"); $showfield = 1;
 				}
 			}
@@ -1513,13 +1513,13 @@ if ($id) {
 		print '<tr class="liste_titre_filter">';
 		$filterfound = 0;
 		foreach ($fieldlist as $field => $value) {
-			if ($fieldlist[$field] == 'entity') {
+			if ($value == 'entity') {
 				continue;
 			}
 
 			$showfield = 1; // By default
 
-			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+			if ($value == 'region_id' || $value == 'country_id') {
 				$showfield = 0;
 			}
 
@@ -1555,7 +1555,7 @@ if ($id) {
 		// Title of lines
 		print '<tr class="liste_titre">';
 		foreach ($fieldlist as $field => $value) {
-			if ($fieldlist[$field] == 'entity') {
+			if ($value == 'entity') {
 				continue;
 			}
 
@@ -1568,17 +1568,17 @@ if ($id) {
 			$showfield = 1; // By defaut
 			$cssprefix = '';
 			$sortable = 1;
-			$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+			$valuetoshow = ucfirst($value); // By defaut
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 
 			// Special cases
-			if ($fieldlist[$field] == 'source') {
+			if ($value == 'source') {
 				$valuetoshow = $langs->trans("Contact");
 			}
-			if ($fieldlist[$field] == 'price') {
+			if ($value == 'price') {
 				$valuetoshow = $langs->trans("PriceUHT");
 			}
-			if ($fieldlist[$field] == 'taux') {
+			if ($value == 'taux') {
 				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") {
 					$valuetoshow = $langs->trans("Rate");
 				} else {
@@ -1586,167 +1586,167 @@ if ($id) {
 				}
 				$cssprefix = 'center ';
 			}
-			if ($fieldlist[$field] == 'localtax1_type') {
+			if ($value == 'localtax1_type') {
 				$valuetoshow = $langs->trans("UseLocalTax")." 2"; $cssprefix = "center "; $sortable = 0;
 			}
-			if ($fieldlist[$field] == 'localtax1') {
+			if ($value == 'localtax1') {
 				$valuetoshow = $langs->trans("Rate")." 2"; $cssprefix = "center "; $sortable = 0;
 			}
-			if ($fieldlist[$field] == 'localtax2_type') {
+			if ($value == 'localtax2_type') {
 				$valuetoshow = $langs->trans("UseLocalTax")." 3"; $cssprefix = "center "; $sortable = 0;
 			}
-			if ($fieldlist[$field] == 'localtax2') {
+			if ($value == 'localtax2') {
 				$valuetoshow = $langs->trans("Rate")." 3"; $cssprefix = "center "; $sortable = 0;
 			}
-			if ($fieldlist[$field] == 'organization') {
+			if ($value == 'organization') {
 				$valuetoshow = $langs->trans("Organization");
 			}
-			if ($fieldlist[$field] == 'lang') {
+			if ($value == 'lang') {
 				$valuetoshow = $langs->trans("Language");
 			}
-			if ($fieldlist[$field] == 'type') {
+			if ($value == 'type') {
 				$valuetoshow = $langs->trans("Type");
 			}
-			if ($fieldlist[$field] == 'code') {
+			if ($value == 'code') {
 				$valuetoshow = $langs->trans("Code");
 			}
-			if ($fieldlist[$field] == 'pos') {
+			if ($value == 'pos') {
 				$cssprefix = 'right '; $valuetoshow = $langs->trans("Position");
 			}
-			if ($fieldlist[$field] == 'position') {
+			if ($value == 'position') {
 				$cssprefix = 'right '; $valuetoshow = $langs->trans("Position");
 			}
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+			if ($value == 'libelle' || $value == 'label') {
 				$valuetoshow = $langs->trans("Label");
 			}
-			if ($fieldlist[$field] == 'libelle_facture') {
+			if ($value == 'libelle_facture') {
 				$valuetoshow = $langs->trans("LabelOnDocuments");
 			}
-			if ($fieldlist[$field] == 'country') {
+			if ($value == 'country') {
 				$valuetoshow = $langs->trans("Country");
 			}
-			if ($fieldlist[$field] == 'recuperableonly') {
+			if ($value == 'recuperableonly') {
 				$valuetoshow = $langs->trans("NPR"); $cssprefix = "center ";
 			}
-			if ($fieldlist[$field] == 'nbjour') {
+			if ($value == 'nbjour') {
 				$valuetoshow = $langs->trans("NbOfDays");
 			}
-			if ($fieldlist[$field] == 'type_cdr') {
+			if ($value == 'type_cdr') {
 				$valuetoshow = $langs->trans("AtEndOfMonth"); $cssprefix = "center ";
 			}
-			if ($fieldlist[$field] == 'decalage') {
+			if ($value == 'decalage') {
 				$valuetoshow = $langs->trans("Offset");
 			}
-			if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') {
+			if ($value == 'width' || $value == 'nx') {
 				$valuetoshow = $langs->trans("Width");
 			}
-			if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') {
+			if ($value == 'height' || $value == 'ny') {
 				$valuetoshow = $langs->trans("Height");
 			}
-			if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') {
+			if ($value == 'unit' || $value == 'metric') {
 				$valuetoshow = $langs->trans("MeasuringUnit");
 			}
-			if ($fieldlist[$field] == 'accountancy_code') {
+			if ($value == 'accountancy_code') {
 				$valuetoshow = $langs->trans("AccountancyCode");
 			}
-			if ($fieldlist[$field] == 'accountancy_code_sell') {
+			if ($value == 'accountancy_code_sell') {
 				$valuetoshow = $langs->trans("AccountancyCodeSell"); $sortable = 0;
 			}
-			if ($fieldlist[$field] == 'accountancy_code_buy') {
+			if ($value == 'accountancy_code_buy') {
 				$valuetoshow = $langs->trans("AccountancyCodeBuy"); $sortable = 0;
 			}
-			if ($fieldlist[$field] == 'fk_pcg_version') {
+			if ($value == 'fk_pcg_version') {
 				$valuetoshow = $langs->trans("Pcg_version");
 			}
-			if ($fieldlist[$field] == 'account_parent') {
+			if ($value == 'account_parent') {
 				$valuetoshow = $langs->trans("Accountsparent");
 			}
-			if ($fieldlist[$field] == 'pcg_type') {
+			if ($value == 'pcg_type') {
 				$valuetoshow = $langs->trans("Pcg_type");
 			}
-			if ($fieldlist[$field] == 'pcg_subtype') {
+			if ($value == 'pcg_subtype') {
 				$valuetoshow = $langs->trans("Pcg_subtype");
 			}
-			if ($fieldlist[$field] == 'sortorder') {
+			if ($value == 'sortorder') {
 				$valuetoshow = $langs->trans("SortOrder");
 			}
-			if ($fieldlist[$field] == 'short_label') {
+			if ($value == 'short_label') {
 				$valuetoshow = $langs->trans("ShortLabel");
 			}
-			if ($fieldlist[$field] == 'range_account') {
+			if ($value == 'range_account') {
 				$valuetoshow = $langs->trans("Range");
 			}
-			if ($fieldlist[$field] == 'sens') {
+			if ($value == 'sens') {
 				$valuetoshow = $langs->trans("Sens");
 			}
-			if ($fieldlist[$field] == 'category_type') {
+			if ($value == 'category_type') {
 				$valuetoshow = $langs->trans("Calculated");
 			}
-			if ($fieldlist[$field] == 'formula') {
+			if ($value == 'formula') {
 				$valuetoshow = $langs->trans("Formula");
 			}
-			if ($fieldlist[$field] == 'paper_size') {
+			if ($value == 'paper_size') {
 				$valuetoshow = $langs->trans("PaperSize");
 			}
-			if ($fieldlist[$field] == 'orientation') {
+			if ($value == 'orientation') {
 				$valuetoshow = $langs->trans("Orientation");
 			}
-			if ($fieldlist[$field] == 'leftmargin') {
+			if ($value == 'leftmargin') {
 				$valuetoshow = $langs->trans("LeftMargin");
 			}
-			if ($fieldlist[$field] == 'topmargin') {
+			if ($value == 'topmargin') {
 				$valuetoshow = $langs->trans("TopMargin");
 			}
-			if ($fieldlist[$field] == 'spacex') {
+			if ($value == 'spacex') {
 				$valuetoshow = $langs->trans("SpaceX");
 			}
-			if ($fieldlist[$field] == 'spacey') {
+			if ($value == 'spacey') {
 				$valuetoshow = $langs->trans("SpaceY");
 			}
-			if ($fieldlist[$field] == 'font_size') {
+			if ($value == 'font_size') {
 				$valuetoshow = $langs->trans("FontSize");
 			}
-			if ($fieldlist[$field] == 'custom_x') {
+			if ($value == 'custom_x') {
 				$valuetoshow = $langs->trans("CustomX");
 			}
-			if ($fieldlist[$field] == 'custom_y') {
+			if ($value == 'custom_y') {
 				$valuetoshow = $langs->trans("CustomY");
 			}
-			if ($fieldlist[$field] == 'percent') {
+			if ($value == 'percent') {
 				$valuetoshow = $langs->trans("Percentage");
 			}
-			if ($fieldlist[$field] == 'affect') {
+			if ($value == 'affect') {
 				$valuetoshow = $langs->trans("WithCounter");
 			}
-			if ($fieldlist[$field] == 'delay') {
+			if ($value == 'delay') {
 				$valuetoshow = $langs->trans("NoticePeriod");
 			}
-			if ($fieldlist[$field] == 'newbymonth') {
+			if ($value == 'newbymonth') {
 				$valuetoshow = $langs->trans("NewByMonth");
 			}
-			if ($fieldlist[$field] == 'fk_tva') {
+			if ($value == 'fk_tva') {
 				$valuetoshow = $langs->trans("VAT");
 			}
-			if ($fieldlist[$field] == 'range_ik') {
+			if ($value == 'range_ik') {
 				$valuetoshow = $langs->trans("RangeIk");
 			}
-			if ($fieldlist[$field] == 'fk_c_exp_tax_cat') {
+			if ($value == 'fk_c_exp_tax_cat') {
 				$valuetoshow = $langs->trans("CarCategory");
 			}
-			if ($fieldlist[$field] == 'revenuestamp_type') {
+			if ($value == 'revenuestamp_type') {
 				$valuetoshow = $langs->trans('TypeOfRevenueStamp');
 			}
-			if ($fieldlist[$field] == 'use_default') {
+			if ($value == 'use_default') {
 				$valuetoshow = $langs->trans('Default'); $cssprefix = 'center ';
 			}
-			if ($fieldlist[$field] == 'unit_type') {
+			if ($value == 'unit_type') {
 				$valuetoshow = $langs->trans('TypeOfUnit');
 			}
-			if ($fieldlist[$field] == 'public' && $tablib[$id] == 'TicketDictCategory') {
+			if ($value == 'public' && $tablib[$id] == 'TicketDictCategory') {
 				$valuetoshow = $langs->trans('TicketGroupIsPublic'); $cssprefix = 'center ';
 			}
 
-			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+			if ($value == 'region_id' || $value == 'country_id') {
 				$showfield = 0;
 			}
 
@@ -1760,7 +1760,7 @@ if ($id) {
 					$newvaluetoshow = $valuetoshow;
 				}
 
-				print getTitleFieldOfList($newvaluetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $cssprefix);
+				print getTitleFieldOfList($newvaluetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $value : ''), ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $cssprefix);
 			}
 		}
 		// Favorite - Only activated on country dictionary
@@ -1814,9 +1814,9 @@ if ($id) {
 							//var_dump($fieldlist);
 							$class = '';
 							$showfield = 1;
-							$valuetoshow = $obj->{$fieldlist[$field]};
+							$valuetoshow = empty($obj->{$value}) ? '' : $obj->{$value};
 
-							if ($fieldlist[$field] == 'entity') {
+							if ($value == 'entity') {
 								$withentity = $valuetoshow;
 								continue;
 							}
@@ -1827,17 +1827,17 @@ if ($id) {
 								$valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
 							} elseif ($valuetoshow == 'all') {
 								$valuetoshow = $langs->trans('All');
-							} elseif ($fieldlist[$field] == 'country') {
+							} elseif ($value == 'country') {
 								if (empty($obj->country_code)) {
 									$valuetoshow = '-';
 								} else {
 									$key = $langs->trans("Country".strtoupper($obj->country_code));
 									$valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
 								}
-							} elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+							} elseif ($value == 'recuperableonly' || $value == 'deductible' || $value == 'category_type') {
 								$valuetoshow = yn($valuetoshow);
 								$class = "center";
-							} elseif ($fieldlist[$field] == 'type_cdr') {
+							} elseif ($value == 'type_cdr') {
 								if (empty($valuetoshow)) {
 									$valuetoshow = $langs->trans('None');
 								} elseif ($valuetoshow == 1) {
@@ -1846,157 +1846,157 @@ if ($id) {
 									$valuetoshow = $langs->trans('CurrentNext');
 								}
 								$class = "center";
-							} elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
+							} elseif ($value == 'price' || preg_match('/^amount/i', $value)) {
 								$valuetoshow = price($valuetoshow);
 							}
 							if ($value == 'private') {
 								$valuetoshow = yn($elementList[$valuetoshow]);
-							} elseif ($fieldlist[$field] == 'libelle_facture') {
+							} elseif ($value == 'libelle_facture') {
 								$langs->load("bills");
 								$key = $langs->trans("PaymentCondition".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+								$valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$value});
 								$valuetoshow = nl2br($valuetoshow);
-							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
 								$key = $langs->trans("Country".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
+								$valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
 								$langs->load("propal");
 								$key = $langs->trans("AvailabilityType".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+								$valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
 								$key = $langs->trans("Action".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
+								$valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif (!empty($obj->code_iso) && $value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
 								$key = $langs->trans("Currency".strtoupper($obj->code_iso));
-								$valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
+								$valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$value});
+							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
 								$key = $langs->trans(strtoupper($obj->code));
-								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
+								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
 								$key = $langs->trans(strtoupper($obj->code));
-								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
+								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
 								$key = $langs->trans("Civility".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
+								$valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
 								$langs->load('agenda');
 								$key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
+								$valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
 								$langs->load("bills");
 								$key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+								$valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
 								$langs->load("bills");
 								$key = $langs->trans("PaymentType".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+								$valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
 								$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
 								$valuetoshow = $payment_type_list[$valuetoshow];
-							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
+							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
 								$key = $langs->trans("DemandReasonType".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
+								$valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
 								$langs->load("orders");
 								$key = $langs->trans($obj->code);
-								$valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$fieldlist[$field]};
-							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
+								$valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$value};
+							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
 								$langs->load("sendings");
 								$key = $langs->trans("SendingMethod".strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format') {
+								$valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format') {
 								$key = $langs->trans('PaperFormat'.strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees') {
+								$valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees') {
 								$langs->load('trips');
 								$key = $langs->trans(strtoupper($obj->code));
-								$valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+								$valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$value});
+							} elseif ($value == 'region_id' || $value == 'country_id') {
 								$showfield = 0;
-							} elseif ($fieldlist[$field] == 'unicode') {
+							} elseif ($value == 'unicode') {
 								$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
-							} elseif ($fieldlist[$field] == 'label' && $tabname[GETPOST("id", 'int')] == MAIN_DB_PREFIX.'c_units') {
+							} elseif ($value == 'label' && $tabname[GETPOST("id", 'int')] == MAIN_DB_PREFIX.'c_units') {
 								$langs->load("products");
-								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'short_label' && $tabname[GETPOST("id", 'int')] == MAIN_DB_PREFIX.'c_units') {
+								$valuetoshow = $langs->trans($obj->{$value});
+							} elseif ($value == 'short_label' && $tabname[GETPOST("id", 'int')] == MAIN_DB_PREFIX.'c_units') {
 								$langs->load("products");
-								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-							} elseif (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')) {
+								$valuetoshow = $langs->trans($obj->{$value});
+							} elseif (($value == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')) {
 								$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
-								$valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
+								$valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$value});
+							} elseif ($value == 'localtax1' || $value == 'localtax2') {
 								$class = "center";
-							} elseif ($fieldlist[$field] == 'localtax1_type') {
+							} elseif ($value == 'localtax1_type') {
 								if ($obj->localtax1 != 0) {
 									$valuetoshow = $localtax_typeList[$valuetoshow];
 								} else {
 									$valuetoshow = '';
 								}
 								$class = "center";
-							} elseif ($fieldlist[$field] == 'localtax2_type') {
+							} elseif ($value == 'localtax2_type') {
 								if ($obj->localtax2 != 0) {
 									$valuetoshow = $localtax_typeList[$valuetoshow];
 								} else {
 									$valuetoshow = '';
 								}
 								$class = "center";
-							} elseif ($fieldlist[$field] == 'taux') {
+							} elseif ($value == 'taux') {
 								$valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
 								$class = "center";
-							} elseif (in_array($fieldlist[$field], array('recuperableonly'))) {
+							} elseif (in_array($value, array('recuperableonly'))) {
 								$class = "center";
-							} elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy') {
+							} elseif ($value == 'accountancy_code' || $value == 'accountancy_code_sell' || $value == 'accountancy_code_buy') {
 								$valuetoshow = length_accountg($valuetoshow);
-							} elseif ($fieldlist[$field] == 'fk_tva') {
+							} elseif ($value == 'fk_tva') {
 								foreach ($form->cache_vatrates as $key => $Tab) {
 									if ($form->cache_vatrates[$key]['rowid'] == $valuetoshow) {
 										$valuetoshow = $form->cache_vatrates[$key]['libtva'];
 										break;
 									}
 								}
-							} elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat') {
+							} elseif ($value == 'fk_c_exp_tax_cat') {
 								$valuetoshow = getDictvalue(MAIN_DB_PREFIX.'c_exp_tax_cat', 'label', $valuetoshow);
 								$valuetoshow = $langs->trans($valuetoshow);
 							} elseif ($tabname[$id] == MAIN_DB_PREFIX.'c_exp_tax_cat') {
 								$valuetoshow = $langs->trans($valuetoshow);
-							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_units') {
+							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_units') {
 								$langs->load('other');
 								$key = $langs->trans($obj->label);
-								$valuetoshow = ($obj->label && $key != strtoupper($obj->label) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'code' && $id == 3) {
+								$valuetoshow = ($obj->label && $key != strtoupper($obj->label) ? $key : $obj->{$value});
+							} elseif ($value == 'code' && $id == 3) {
 								$valuetoshow = $obj->state_code;
-							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') {
+							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') {
 								$langs->load("products");
-								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+								$valuetoshow = $langs->trans($obj->{$value});
 							}
 							$class .= ($class ? ' ' : '').'tddict';
-							if ($fieldlist[$field] == 'note' && $id == 10) {
+							if ($value == 'note' && $id == 10) {
 								$class .= ' tdoverflowmax200';
 							}
-							if ($fieldlist[$field] == 'tracking') {
+							if ($value == 'tracking') {
 								$class .= ' tdoverflowauto';
 							}
-							if ($fieldlist[$field] == 'position') {
+							if ($value == 'position') {
 								$class .= ' right';
 							}
-							if ($fieldlist[$field] == 'localtax1_type') {
+							if ($value == 'localtax1_type') {
 								$class .= ' nowrap';
 							}
-							if ($fieldlist[$field] == 'localtax2_type') {
+							if ($value == 'localtax2_type') {
 								$class .= ' nowrap';
 							}
-							if ($fieldlist[$field] == 'pos') {
+							if ($value == 'pos') {
 								$class .= ' right';
 							}
-							if ($fieldlist[$field] == 'use_default') {
+							if ($value == 'use_default') {
 								$class .= ' center';
 							}
-							if ($fieldlist[$field] == 'public') {
+							if ($value == 'public') {
 								$class .= ' center';
 							}
 							// Show value for field
 							if ($showfield) {
-								print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+								print '<!-- '. $value .' --><td class="'.$class.'">'.$valuetoshow.'</td>';
 							}
 						}
 					}
@@ -2024,12 +2024,12 @@ if ($id) {
 					if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) {
 						$iserasable = 0;
 					}
-					if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')) || in_array(empty($obj->type) ? '' : $obj->type, array('systemauto'))) {
+					if (in_array(empty($obj->code) ? '' : $obj->code, array('AC_OTH', 'AC_OTH_AUTO')) || in_array(empty($obj->type) ? '' : $obj->type, array('systemauto'))) {
 						$canbedisabled = 0; $canbedisabled = 0;
 					}
 					$canbemodified = $iserasable;
 
-					if ($obj->code == 'RECEP') {
+					if (!empty($obj->code) && $obj->code == 'RECEP') {
 						$canbemodified = 1;
 					}
 					if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") {
@@ -2042,7 +2042,7 @@ if ($id) {
 					if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27, 32))) {
 						$rowidcol = 'rowid';
 					}
-					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol} : (!empty($obj->code) ? urlencode($obj->code) : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
+					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(isset($obj->{$rowidcol}) ? $obj->{$rowidcol} : (!empty($obj->code) ? urlencode($obj->code) : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
 					if (!empty($param)) {
 						$url .= '&'.$param;
 					}
@@ -2196,18 +2196,18 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 	$withentity = '';
 
 	foreach ($fieldlist as $field => $value) {
-		if ($fieldlist[$field] == 'entity') {
-			$withentity = $obj->{$fieldlist[$field]};
+		if ($value == 'entity') {
+			$withentity = $obj->{$value};
 			continue;
 		}
 
-		if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
-			$hidden = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'');
+		if (in_array($value, array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
+			$hidden = (!empty($obj->{$value}) ? $obj->{$value}:'');
 			print '<td>';
-			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
+			print '<input type="hidden" name="'. $value .'" value="'.$hidden.'">';
 			print $langs->trans($hidden);
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'country') {
+		} elseif ($value == 'country') {
 			if (in_array('region_id', $fieldlist)) {
 				print '<td>';
 				print '</td>';
@@ -2217,71 +2217,71 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			$fieldname = 'country';
 			print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : '')), $fieldname, '', 28, 'maxwidth150 maxwidthonsmartphone');
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'country_id') {
+		} elseif ($value == 'country_id') {
 			if (!in_array('country', $fieldlist)) {	// If there is already a field country, we don't show country_id (avoid duplicate)
-				$country_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : 0);
+				$country_id = (!empty($obj->{$value}) ? $obj->{$value} : 0);
 				print '<td class="tdoverflowmax100">';
-				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
+				print '<input type="hidden" name="'. $value .'" value="'.$country_id.'">';
 				print '</td>';
 			}
-		} elseif ($fieldlist[$field] == 'region') {
+		} elseif ($value == 'region') {
 			print '<td>';
 			$formcompany->select_region($region_id, 'region');
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'region_id') {
-			$region_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:0);
+		} elseif ($value == 'region_id') {
+			$region_id = (!empty($obj->{$value}) ? $obj->{$value}:0);
 			print '<td>';
-			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
+			print '<input type="hidden" name="'. $value .'" value="'.$region_id.'">';
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'lang') {
+		} elseif ($value == 'lang') {
 			print '<td>';
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'element') {
+		} elseif ($value == 'element') {
 			// The type of the element (for contact types)
 			print '<td>';
-			print $form->selectarray('element', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
+			print $form->selectarray('element', $elementList, (!empty($obj->{$value}) ? $obj->{$value}:''));
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'source') {
+		} elseif ($value == 'source') {
 			// The source of the element (for contact types)
 			print '<td>';
-			print $form->selectarray('source', $sourceList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
+			print $form->selectarray('source', $sourceList, (!empty($obj->{$value}) ? $obj->{$value}:''));
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'private') {
+		} elseif ($value == 'private') {
 			print '<td>';
-			print $form->selectyesno("private", (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
+			print $form->selectyesno("private", (!empty($obj->{$value}) ? $obj->{$value}:''));
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm") {
+		} elseif ($value == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm") {
 			$type = (!empty($obj->type) ? $obj->type : 'user'); // Check if type is different of 'user' (external module)
 			print '<td>';
 			print $type.'<input type="hidden" name="type" value="'.$type.'">';
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX.'c_paiement') {
+		} elseif ($value == 'type' && $tabname == MAIN_DB_PREFIX.'c_paiement') {
 			print '<td>';
 			$select_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
-			print $form->selectarray($fieldlist[$field], $select_list, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'2'));
+			print $form->selectarray($value, $select_list, (!empty($obj->{$value}) ? $obj->{$value}:'2'));
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-			if ($fieldlist[$field] == 'type_cdr') {
+		} elseif ($value == 'recuperableonly' || $value == 'type_cdr' || $value == 'deductible' || $value == 'category_type') {
+			if ($value == 'type_cdr') {
 				print '<td class="center">';
 			} else {
 				print '<td>';
 			}
-			if ($fieldlist[$field] == 'type_cdr') {
-				print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
+			if ($value == 'type_cdr') {
+				print $form->selectarray($value, array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$value}) ? $obj->{$value}:''));
 			} else {
-				print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
+				print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value}:''), 1);
 			}
 			print '</td>';
-		} elseif (in_array($fieldlist[$field], array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
+		} elseif (in_array($value, array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
 			$class = "left";
-			if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2'))) {
+			if (in_array($value, array('taux', 'localtax1', 'localtax2'))) {
 				$class = "center"; // Fields aligned on right
 			}
 			print '<td class="'.$class.'">';
-			print '<input type="text" class="flat" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="3" name="'.$fieldlist[$field].'">';
+			print '<input type="text" class="flat" value="'.(isset($obj->{$value}) ? $obj->{$value} : '').'" size="3" name="'. $value .'">';
 			print '</td>';
-		} elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
+		} elseif (in_array($value, array('libelle_facture'))) {
 			print '<td>';
 			$transfound = 0;
 			$transkey = '';
@@ -2295,16 +2295,16 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				}
 			}
 			if (!$transfound) {
-				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'</textarea>';
+				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'. $value .'">'.(!empty($obj->{$value}) ? $obj->{$value}:'').'</textarea>';
 			} else {
-				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
+				print '<input type="hidden" name="'. $value .'" value="'.$transkey.'">';
 			}
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
-			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
-		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
-			print '<td><input type="text" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
-		} elseif ($fieldlist[$field] == 'unit') {
+		} elseif ($value == 'price' || preg_match('/^amount/i', $value)) {
+			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$value}) ? $obj->{$value}:'')).'" name="'. $value .'"></td>';
+		} elseif ($value == 'code' && isset($obj->{$value})) {
+			print '<td><input type="text" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$value}) ? $obj->{$value}:'').'" name="'. $value .'"></td>';
+		} elseif ($value == 'unit') {
 			print '<td>';
 			$units = array(
 					'mm' => $langs->trans('SizeUnitmm'),
@@ -2312,40 +2312,40 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 					'point' => $langs->trans('SizeUnitpoint'),
 					'inch' => $langs->trans('SizeUnitinch')
 			);
-			print $form->selectarray('unit', $units, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 0, 0, 0);
+			print $form->selectarray('unit', $units, (!empty($obj->{$value}) ? $obj->{$value}:''), 0, 0, 0);
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'localtax1_type' || $fieldlist[$field] == 'localtax2_type') {
+		} elseif ($value == 'localtax1_type' || $value == 'localtax2_type') {
 			// Le type de taxe locale
 			print '<td class="center">';
-			print $form->selectarray($fieldlist[$field], $localtax_typeList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
+			print $form->selectarray($value, $localtax_typeList, (!empty($obj->{$value}) ? $obj->{$value}:''));
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy') {
+		} elseif ($value == 'accountancy_code' || $value == 'accountancy_code_sell' || $value == 'accountancy_code_buy') {
 			print '<td>';
 			if (!empty($conf->accounting->enabled)) {
-				$fieldname = $fieldlist[$field];
+				$fieldname = $value;
 				$accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
-				print $formaccounting->select_account($accountancy_account, '.'.$fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccounting->select_account($accountancy_account, '.'. $value, 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			} else {
-				$fieldname = $fieldlist[$field];
-				print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
+				$fieldname = $value;
+				print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'. $value .'">';
 			}
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'fk_tva') {
+		} elseif ($value == 'fk_tva') {
 			print '<td>';
 			print $form->load_tva('fk_tva', $obj->taux, $mysoc, new Societe($db), 0, 0, '', false, -1);
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat') {
+		} elseif ($value == 'fk_c_exp_tax_cat') {
 			print '<td>';
 			print $form->selectExpenseCategories($obj->fk_c_exp_tax_cat);
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'fk_range') {
+		} elseif ($value == 'fk_range') {
 			print '<td>';
 			print $form->selectExpenseRanges($obj->fk_range);
 			print '</td>';
 		} else {
-			$fieldValue = isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'';
+			$fieldValue = isset($obj->{$value}) ? $obj->{$value}:'';
 
-			if ($fieldlist[$field] == 'sortorder') {
+			if ($value == 'sortorder') {
 				$fieldlist[$field] = 'position';
 			}