lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed display issue on import step 4 screen when import_entities_array

Browse Source 
is empty. also fixed an extra -> displayed.
This commit is contained in:
bgenere 2016-11-28 16:44:58 +01:00
parent 093942bcd7
commit 71434d84dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/imports/import.php
View File

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