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

Merge pull request #21086 from Hystepik/develop#2

Browse Source 
Fix: import update on xlsx
This commit is contained in:
Laurent Destailleur 2022-06-01 19:40:08 +02:00 committed by GitHub
commit 3dcd9fcfe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -920,7 +920,7 @@ class ImportXlsx extends ModeleImports
if (empty($keyfield)) { if (empty($keyfield)) {
$keyfield = 'rowid'; $keyfield = 'rowid';
} }
$sqlSelect .= "WHERE ".$keyfield." = ".((int) $lastinsertid); $sqlSelect .= " WHERE ".$keyfield." = ".((int) $lastinsertid);
$resql = $this->db->query($sqlSelect); $resql = $this->db->query($sqlSelect);
if ($resql) { if ($resql) {

2
htdocs/imports/import.php
View File

@ -1120,7 +1120,7 @@ if ($step == 4 && $datatoimport) {
$j = 0; $j = 0;
foreach ($optionsall as $tmpcode => $tmpval) { // Loop on each entry to add into each combo list. foreach ($optionsall as $tmpcode => $tmpval) { // Loop on each entry to add into each combo list.
$label = ''; $label = '';
if ($tmpval['picto']) { if (!empty($tmpval['picto'])) {
$label .= img_picto('', $tmpval['picto'], 'class="pictofixedwidth"'); $label .= img_picto('', $tmpval['picto'], 'class="pictofixedwidth"');
} }
$label .= $tmpval['required'] ? '<strong>' : ''; $label .= $tmpval['required'] ? '<strong>' : '';