diff --git a/htdocs/includes/modules/import/import_csv.modules.php b/htdocs/includes/modules/import/import_csv.modules.php index 6b52d62522fcb49f7b862501f83304476a5209b1..400b74706914e05fec6914d21628a13cf2f336e2 100644 --- a/htdocs/includes/modules/import/import_csv.modules.php +++ b/htdocs/includes/modules/import/import_csv.modules.php @@ -168,6 +168,8 @@ class ImportCsv extends ModeleImports dol_syslog("ImportCsv::open_file file=".$file); + ini_set('auto_detect_line_endings',1); // For MAC compatibility + $newfile=utf8_check($file)?utf8_decode($file):$file; // fopen need ISO file name $this->handle = fopen($newfile, "r"); if (! $this->handle) diff --git a/htdocs/includes/modules/modImport.class.php b/htdocs/includes/modules/modImport.class.php index 017dc3764c19483c85dcc311435126e43bad84dd..c51f843d582ab57e15de4d7fb9c9ab75cda11822 100644 --- a/htdocs/includes/modules/modImport.class.php +++ b/htdocs/includes/modules/modImport.class.php @@ -65,7 +65,7 @@ class modImport extends DolibarrModules // D�pendances $this->depends = array(); $this->requiredby = array(); - $this->phpmin = array(4,2,0); + $this->phpmin = array(4,3,0); // Need auto_detect_line_endings php option to solve MAC pbs. $this->phpmax = array(); $this->need_dolibarr_version = array(2,7,-1); // Minimum version of Dolibarr required by module $this->need_javascript_ajax = 1;