From 58a1904c155b4892fc06bf91e403df68f8b7d593 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 18 Feb 2021 12:48:06 +0100
Subject: [PATCH] fix column count

---
 .../modules/import/import_xlsx.modules.php    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 9d3c4e2b94e..ebe0486d97c 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -372,7 +372,7 @@ class ImportXlsx extends ModeleImports
 
 		//var_dump($sort_array_match_file_to_database);
 
-		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val']))) {
+		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[1]['val']))) {
 			//print 'W';
 			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
 			$this->warnings[$warning]['type'] = 'EMPTY';
@@ -401,7 +401,7 @@ class ImportXlsx extends ModeleImports
 						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
 					} else dol_print_error($this->db);
 				} else {
-					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
+					dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
 				// array of fields to column index
@@ -420,7 +420,7 @@ class ImportXlsx extends ModeleImports
 					if ($key <= $maxfields) {
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
 						$newval = '';
-						if ($arrayrecord[($key - 1)]['type'] > 0) $newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
+						if ($arrayrecord[($key)]['type'] > 0) $newval = $arrayrecord[($key)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
 
 						// Make some tests on $newval
 
@@ -572,21 +572,21 @@ class ImportXlsx extends ModeleImports
 										$newval = $this->thirpartyobject->code_client;
 										//print 'code_client='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) $arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
 									if (strtolower($newval) == 'auto') {
 										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
 										$newval = $this->thirpartyobject->code_fournisseur;
 										//print 'code_fournisseur='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) $arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto') {
 										$this->thirpartyobject->get_codecompta('customer');
 										$newval = $this->thirpartyobject->code_compta;
 										//print 'code_compta='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) $arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto') {
 										$this->thirpartyobject->get_codecompta('supplier');
@@ -594,7 +594,7 @@ class ImportXlsx extends ModeleImports
 										if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
 										//print 'code_compta_fournisseur='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) $arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto') {
 									$defaultref = '';
 									// TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
@@ -624,7 +624,7 @@ class ImportXlsx extends ModeleImports
 										$errorforthistable++;
 										$error++;
 									} else {
-										$newval = $arrayrecord[($key - 1)]['val']; //We get new value computed.
+										$newval = $arrayrecord[($key)]['val']; //We get new value computed.
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
@@ -695,8 +695,8 @@ class ImportXlsx extends ModeleImports
 						$listfields[] = $fieldname;
 
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0)		 $listvalues[] = ($newval == '0' ? $newval : "null");
-						elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0)	 $listvalues[] = "''";
+						if (empty($newval) && $arrayrecord[($key)]['type'] < 0)		 $listvalues[] = ($newval == '0' ? $newval : "null");
+						elseif (empty($newval) && $arrayrecord[($key)]['type'] == 0)	 $listvalues[] = "''";
 						else $listvalues[] = "'" . $this->db->escape($newval) . "'";
 					}
 					$i++;