Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
This commit is contained in:
commit
1a79401065
@ -1082,9 +1082,9 @@ if ($step == 4 && $datatoimport) {
|
||||
$valforsourcefieldnb[$lefti] = $key;
|
||||
$lefti++;
|
||||
|
||||
if ($lefti > count($fieldstarget)) {
|
||||
/*if ($lefti > count($fieldstarget)) {
|
||||
break; // Other fields are in the not imported area
|
||||
}
|
||||
}*/
|
||||
}
|
||||
//var_dump($valforsourcefieldnb);
|
||||
|
||||
@ -1138,9 +1138,9 @@ if ($step == 4 && $datatoimport) {
|
||||
|
||||
print '<table class="nobordernopadding centpercent tableimport">';
|
||||
foreach ($fieldssource as $code => $line) { // $fieldssource is an array code=column num, line=content on first line for column in source file.
|
||||
if ($i == $minpos) {
|
||||
/*if ($i == $minpos) {
|
||||
break;
|
||||
}
|
||||
}*/
|
||||
print '<tr style="height:'.$height.'" class="trimport oddevenimport">';
|
||||
$entity = (!empty($objimport->array_import_entities[0][$code]) ? $objimport->array_import_entities[0][$code] : $objimport->array_import_icon[0]);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user