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

Fix: Import of MAC files

Browse Source
This commit is contained in:
Laurent Destailleur 2009-10-28 16:34:05 +00:00
parent 6e3b02bb99
commit f4b595ee3f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/includes/modules/import/import_csv.modules.php
View File

@ -168,6 +168,8 @@ class ImportCsv extends ModeleImports
dol_syslog("ImportCsv::open_file file=".$file); 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 $newfile=utf8_check($file)?utf8_decode($file):$file; // fopen need ISO file name
$this->handle = fopen($newfile, "r"); $this->handle = fopen($newfile, "r");
if (! $this->handle) if (! $this->handle)

2
htdocs/includes/modules/modImport.class.php
View File

@ -65,7 +65,7 @@ class modImport extends DolibarrModules
// D<>pendances // D<>pendances
$this->depends = array(); $this->depends = array();
$this->requiredby = 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->phpmax = array();
$this->need_dolibarr_version = array(2,7,-1); // Minimum version of Dolibarr required by module $this->need_dolibarr_version = array(2,7,-1); // Minimum version of Dolibarr required by module
$this->need_javascript_ajax = 1; $this->need_javascript_ajax = 1;