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

Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0

Browse Source
This commit is contained in:
Laurent Destailleur 2023-03-30 12:38:36 +02:00
commit 1a79401065
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/imports/import.php
View File

@ -1082,9 +1082,9 @@ if ($step == 4 && $datatoimport) {
$valforsourcefieldnb[$lefti] = $key; $valforsourcefieldnb[$lefti] = $key;
$lefti++; $lefti++;
if ($lefti > count($fieldstarget)) { /*if ($lefti > count($fieldstarget)) {
break; // Other fields are in the not imported area break; // Other fields are in the not imported area
} }*/
} }
//var_dump($valforsourcefieldnb); //var_dump($valforsourcefieldnb);
@ -1138,9 +1138,9 @@ if ($step == 4 && $datatoimport) {
print '<table class="nobordernopadding centpercent tableimport">'; 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. 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; break;
} }*/
print '<tr style="height:'.$height.'" class="trimport oddevenimport">'; 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]); $entity = (!empty($objimport->array_import_entities[0][$code]) ? $objimport->array_import_entities[0][$code] : $objimport->array_import_icon[0]);