From 8c34a091b4b7663ddef57ccb20cdff909c29bd54 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Mar 2020 19:24:11 +0100
Subject: [PATCH] Fix import

---
 htdocs/admin/import.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/import.php b/htdocs/admin/import.php
index 3ead31ab0f3..37c9b205424 100644
--- a/htdocs/admin/import.php
+++ b/htdocs/admin/import.php
@@ -72,6 +72,10 @@ $h++;
 
 dol_fiche_head($head, 'setup', $langs->trans("ImportArea"), -1, "technic");
 
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="setModuleOptions">';
+print '<input type="hidden" name="param" value="IMPORT_CSV_SEPARATOR_TO_USE">';
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
@@ -80,19 +84,15 @@ print '<td class="center" width="20">&nbsp;</td>';
 print '<td class="center" width="100"></td>'."\n";
 
 print '<tr class="oddeven">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="setModuleOptions">';
-print '<input type="hidden" name="param" value="IMPORT_CSV_SEPARATOR_TO_USE">';
-
-print '<td>'.$langs->trans("ImportCsvSeparator").'</td>';
-print '<td width="60" align="center">'."<input size=\"3\" class=\"flat\" type=\"text\" name=\"value\" value=\"".$conf->global->IMPORT_CSV_SEPARATOR_TO_USE."\"></td>";
+print '<td>'.$langs->trans("ImportCsvSeparator").' ('.$langs->trans("ByDefault").')</td>';
+print '<td width="60" align="center">'."<input size=\"3\" class=\"flat\" type=\"text\" name=\"value\" value=\"".(empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE) ? ',' : $conf->global->IMPORT_CSV_SEPARATOR_TO_USE)."\"></td>";
 print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 print '</td></tr>';
-print '</form>';
 
 print '</table>';
 
+print '</form>';
+
 dol_fiche_end();
 
 // End of page