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

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Browse Source 
Conflicts:
	htdocs/imports/import.php
This commit is contained in:
Laurent Destailleur 2018-02-25 12:21:10 +01:00
commit 6a78ce65e9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/imports/import.php
View File

@ -1475,10 +1475,11 @@ if ($step == 5 && $datatoimport)
$sourcelinenb=0; $endoffile=0; $sourcelinenb=0; $endoffile=0;
// Loop on each input file record // Loop on each input file record
while ($sourcelinenb < $nboflines && ! $endoffile) while (($sourcelinenb < $nboflines) && ! $endoffile)
{ {
$sourcelinenb++; $sourcelinenb++;
// Read line and store it into $arrayrecord // Read line and store it into $arrayrecord
//dol_syslog("line ".$sourcelinenb.' - '.$nboflines.' - '.$excludefirstline.' - '.$endatlinenb);
$arrayrecord=$obj->import_read_record(); $arrayrecord=$obj->import_read_record();
if ($arrayrecord === false) if ($arrayrecord === false)
{ {
@ -1487,7 +1488,7 @@ if ($step == 5 && $datatoimport)
continue; continue;
} }
if ($excludefirstline && ($sourcelinenb < $excludefirstline)) continue; if ($excludefirstline && ($sourcelinenb < $excludefirstline)) continue;
if ($endatlinenb && ($sourcelinenb > $endatlinenb)) continue; if ($endatlinenb && ($sourcelinenb > $endatlinenb)) break;
// Run import // Run import
$result=$obj->import_insert($arrayrecord,$array_match_file_to_database,$objimport,count($fieldssource),$importid,$updatekeys); $result=$obj->import_insert($arrayrecord,$array_match_file_to_database,$objimport,count($fieldssource),$importid,$updatekeys);
@ -1857,7 +1858,7 @@ if ($step == 6 && $datatoimport)
continue; continue;
} }
if ($excludefirstline && ($sourcelinenb < $excludefirstline)) continue; if ($excludefirstline && ($sourcelinenb < $excludefirstline)) continue;
if ($endatlinenb && ($sourcelinenb > $endatlinenb)) continue; if ($endatlinenb && ($sourcelinenb > $endatlinenb)) break;
// Run import // Run import
$result=$obj->import_insert($arrayrecord,$array_match_file_to_database,$objimport,count($fieldssource),$importid,$updatekeys); $result=$obj->import_insert($arrayrecord,$array_match_file_to_database,$objimport,count($fieldssource),$importid,$updatekeys);