Merge branch 'main' into feature/milestone3

# Conflicts:
#	public/userarea/import_insert.php
#	public/userarea/mapping_template_xls_scheme2.php
#	public/userarea/process_import_xls2.php
This commit is contained in:
2026-04-02 12:29:17 +03:00
22 changed files with 2121 additions and 321 deletions
+1 -1
View File
@@ -154,7 +154,7 @@ try {
$columnLetter = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::stringFromColumnIndex($physCol);
$cell = $worksheet->getCell($columnLetter . $row);
$cellValue = $cell ? $cell->getCalculatedValue() : '';
$rowData[] = $cellValue ?: '';
$rowData[] = htmlspecialchars($cellValue ?: '');
}
// Count how many header columns have data in this row