diff --git a/htdocs/core/modules/import/modules_import.class.php b/htdocs/core/modules/import/modules_import.class.php index aceb1c7f31c..d0ef127c49e 100644 --- a/htdocs/core/modules/import/modules_import.class.php +++ b/htdocs/core/modules/import/modules_import.class.php @@ -997,7 +997,7 @@ class ModeleImports * @param string $importid Import key * @param string[] $updatekeys Array of keys used to update first before insert * @param int $recordpositionbase 0 when $arrayrecord starts at 0, 1 when starts at 1 - * @return int Return integer <0 if KO, >0 if OK + * @return int Return integer <0 if KO, >0 if OK */ protected function commonImportInsert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys, $recordpositionbase = 0) { diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 906762fbf32..af7ef8e11a5 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -179,7 +179,6 @@ $objmodelimport = new ModeleImports(); $form = new Form($db); $htmlother = new FormOther($db); -$formfile = new FormFile($db); // Init $array_match_file_to_database from _SESSION if (empty($array_match_file_to_database)) { @@ -1649,25 +1648,25 @@ if ($step == 4 && $datatoimport) { print $langs->trans("ImportFromToLine"); print ''; if ($action == 'launchsimu') { - print ''; + print ''; print ''; } else { - print ''; + print ''; print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine")); } print ' - '; if ($action == 'launchsimu') { - print ''; + print ''; print ''; } else { - print ''; + print ''; print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile")); } if ($action == 'launchsimu') { print '   '.$langs->trans("Modify").''; } if ($excludefirstline == 2) { - print $form->textwithpicto("", $langs->trans("WarningFirstImportedLine", $excludefirstline), 1, 'warning', "warningexcludefirstline"); + print $form->textwithpicto("", $langs->trans("WarningFirstImportedLine", $excludefirstline), 1, 'warning', "warningexcludefirstline valignmiddle"); print '