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

public/userarea/import_edit2.php

@@ -1168,6 +1168,16 @@ function fixedDefaultValue(array $f): string
                                             $key = $f['fixed_field_key'];
                                             $label = $slugMapping[$key] ?? $key;
 
+                                            if ($key === 'ClienteFornitore') {
+                                                $label = 'Fornitore';
+                                            }
+
+                                            if ($key === 'ClienteAnalisi') {
+                                                $label = 'Buyer';
+                                            }
+
+
+
                                             echo "<div class='grid-header' data-index='$headerIndex' style='flex: 0 0 180px; position: relative;'>"
                                                 . htmlspecialchars($label) .
                                                 "<div class='resizer'></div></div>";
@@ -1416,6 +1426,7 @@ function fixedDefaultValue(array $f): string
                             </div>
                         </form>
                         <div id="partsModalContainer"></div>
+                        <div id="analysisModalContainer"></div>
                         <div id="annotationsModalContainer"></div>
                         <?php include 'photos_functions.php'; ?>
                     </div>
@@ -1434,6 +1445,7 @@ function fixedDefaultValue(array $f): string
     <script src="photos.js"></script>
     <script src="annotationsModal.js"></script>
     <script src="partsTable.js"></script>
+    <script src="analysisModal.js"></script>
     <script src="tracking.js"></script>
     <script src="export_to_lims.js"></script>
     <script>