Merge pull request #6082 from bgenere/develop

Fixed 2 issues for custom module development regarding import and dictionnaries list.

htdocs/core/lib/admin.lib.php

@@ -977,7 +977,7 @@ function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql
                             {
                                 //var_dump($objMod->dictionaries['tabname']);
                                 $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp=0;
-                                foreach($objMod->dictionaries['tabname'] as $val)        { $nbtabname++; $taborder[] = count($tabname)+1; $tabname[] = $val; }
+                                foreach($objMod->dictionaries['tabname'] as $val)        { $nbtabname++; $taborder[] = max($taborder)+1; $tabname[] = $val; }
                                 foreach($objMod->dictionaries['tablib'] as $val)         { $nbtablib++; $tablib[] = $val; }
                                 foreach($objMod->dictionaries['tabsql'] as $val)         { $nbtabsql++; $tabsql[] = $val; }
                                 foreach($objMod->dictionaries['tabsqlsort'] as $val)     { $nbtabsqlsort++; $tabsqlsort[] = $val; }

htdocs/imports/import.php

@@ -867,12 +867,12 @@ if ($step == 4 && $datatoimport)
 		print '<tr '.$bc[$var].' height="'.$height.'">';
 
 		$i++;
-
+		
 		$entity=(! empty($objimport->array_import_entities[0][$code])?$objimport->array_import_entities[0][$code]:$objimport->array_import_icon[0]);
 		$tablealias=preg_replace('/(\..*)$/i','',$code);
 		$tablename=$objimport->array_import_tables[0][$tablealias];
-		$entityicon=$entitytoicon[$entity]?$entitytoicon[$entity]:$entity;
-		$entitylang=$entitytolang[$entity]?$entitytolang[$entity]:$entity;
+		$entityicon=$entitytoicon[$entity]?$entitytoicon[$entity]:$objimport->array_import_icon[0];
+		$entitylang=$entitytolang[$entity]?$entitytolang[$entity]:$objimport->array_import_label[0];
 
 		print '<td class="nowrap" style="font-weight: normal">=>'.img_object('',$entityicon).' '.$langs->trans($entitylang).'</td>';
 		print '<td style="font-weight: normal">';