Dolibarr / dolibarr

htdocs/contact/class/contact.class.php

Spacing +1 added lines, -1 removed lines

@@ -1336,7 +1336,7 @@
 		if (!empty($this->poste)) $label .= '<br><b>'.$langs->trans("Poste").':</b> '.$this->poste;
 		$label .= '<br><b>'.$langs->trans("EMail").':</b> '.$this->email;
 		$phonelist = array();
-		$country_code = empty($this->country_code) ? '': $this->country_code;
+		$country_code = empty($this->country_code) ? '' : $this->country_code;
 		if ($this->phone_pro) $phonelist[] = dol_print_phone($this->phone_pro, $country_code, $this->id, 0, '', '&nbsp;', 'phone');
 		if ($this->phone_mobile) $phonelist[] = dol_print_phone($this->phone_mobile, $country_code, $this->id, 0, '', '&nbsp;', 'mobile');
 		if ($this->phone_perso) $phonelist[] = dol_print_phone($this->phone_perso, $country_code, $this->id, 0, '', '&nbsp;', 'phone');

htdocs/fourn/class/fournisseur.product.class.php

Spacing +1 added lines, -1 removed lines

@@ -540,7 +540,7 @@
 
 				$this->fk_product				= $obj->fk_product;
 				$this->product_id				= $obj->fk_product;
-				$this->product_ref				= $obj->product_ref;
+				$this->product_ref = $obj->product_ref;
 
 				$this->fourn_id					= $obj->fk_soc;
 				$this->fourn_ref				= $obj->ref_fourn; // deprecated

htdocs/website/index.php

Spacing +1 added lines, -1 removed lines

@@ -2650,7 +2650,7 @@
 						$formquestion[] = array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0, 'morecss'=>'margintoponly');
 					}
 
-					$value= $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 1, 0, 0, $onlylang, 1);
+					$value = $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 1, 0, 0, $onlylang, 1);
 					$formquestion[] = array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $value);
 
 				   	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);

htdocs/core/modules/DolibarrModules.class.php

Spacing +1 added lines, -1 removed lines

@@ -1285,7 +1285,7 @@
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
-				$sql .= " AND entity = ".$conf->entity;		// Do not use getEntity here, we want to delete only in current company
+				$sql .= " AND entity = ".$conf->entity; // Do not use getEntity here, we want to delete only in current company
 
 				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
 				$resql = $this->db->query($sql);

htdocs/core/lib/date.lib.php

Spacing +1 added lines, -1 removed lines

@@ -607,7 +607,7 @@
 function getGMTEasterDatetime($year)
 {
 	$base = new DateTime("$year-03-21");
-	$days = easter_days($year);	// Return number of days between 21 march and easter day.
+	$days = easter_days($year); // Return number of days between 21 march and easter day.
 	$tmp = $base->add(new DateInterval("P{$days}D"));
 	return $tmp->getTimestamp();
 }

htdocs/core/lib/price.lib.php

Spacing +3 added lines, -3 removed lines

@@ -149,8 +149,8 @@ 
 			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				$localtax1_rate = (float) $obj->localtax1;		// Use float to force to get first numeric value when value is x:y:z
-				$localtax2_rate = (float) $obj->localtax2;		// Use float to force to get first numeric value when value is -19:-15:-9
+				$localtax1_rate = (float) $obj->localtax1; // Use float to force to get first numeric value when value is x:y:z
+				$localtax2_rate = (float) $obj->localtax2; // Use float to force to get first numeric value when value is -19:-15:-9
 				$localtax1_type = $obj->localtax1_type;
 				$localtax2_type = $obj->localtax2_type;
 				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);
@@ -417,7 +417,7 @@ 
 	// initialize result array
 	//for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
 
-	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.(empty($conf->global->MAIN_ROUNDING_RULE_TOT)?'':$conf->global->MAIN_ROUNDING_RULE_TOT).' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
+	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.(empty($conf->global->MAIN_ROUNDING_RULE_TOT) ? '' : $conf->global->MAIN_ROUNDING_RULE_TOT).' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
 
 	return $result;
 }

htdocs/core/modules/import/import_xlsx.modules.php

Spacing +55 added lines, -55 removed lines

@@ -29,7 +29,7 @@ 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 
-require_once DOL_DOCUMENT_ROOT . '/core/modules/import/modules_import.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
 
 
 /**
@@ -112,9 +112,9 @@ 
 		$this->picto = 'mime/xls'; // Picto (This is not used by the example file code as Mime type, too bad ...)
 		$this->version = '1.0'; // Driver version
 		// If driver use an external library, put its name here
-		require_once DOL_DOCUMENT_ROOT . '/includes/phpoffice/autoloader.php';
-		require_once DOL_DOCUMENT_ROOT . '/includes/Psr/autoloader.php';
-		require_once PHPEXCELNEW_PATH . 'Spreadsheet.php';
+		require_once DOL_DOCUMENT_ROOT.'/includes/phpoffice/autoloader.php';
+		require_once DOL_DOCUMENT_ROOT.'/includes/Psr/autoloader.php';
+		require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
 		$this->workbook = new Spreadsheet();
 
 		//if ($this->id == 'excel2007new')
@@ -146,10 +146,10 @@ 
 		// phpcs:enable
 		global $user, $conf, $langs, $file;
 		// create a temporary object, the final output will be generated in footer
-		$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs) . ' - Dolibarr ' . DOL_VERSION);
-		$this->workbook->getProperties()->setTitle($outputlangs->trans("Import") . ' - ' . $file);
-		$this->workbook->getProperties()->setSubject($outputlangs->trans("Import") . ' - ' . $file);
-		$this->workbook->getProperties()->setDescription($outputlangs->trans("Import") . ' - ' . $file);
+		$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
+		$this->workbook->getProperties()->setTitle($outputlangs->trans("Import").' - '.$file);
+		$this->workbook->getProperties()->setSubject($outputlangs->trans("Import").' - '.$file);
+		$this->workbook->getProperties()->setDescription($outputlangs->trans("Import").' - '.$file);
 
 		$this->workbook->setActiveSheetIndex(0);
 		$this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
@@ -242,7 +242,7 @@ 
 		global $langs;
 		$ret = 1;
 
-		dol_syslog(get_class($this) . "::open_file file=" . $file);
+		dol_syslog(get_class($this)."::open_file file=".$file);
 
 		$reader = new Xlsx();
 		$this->workbook = $reader->load($file);
@@ -393,7 +393,7 @@ 
 				// Define $tablewithentity_cache[$tablename] if not already defined
 				if (!isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
 				{
-					dol_syslog("Check if table " . $tablename . " has an entity field");
+					dol_syslog("Check if table ".$tablename." has an entity field");
 					$resql = $this->db->DDLDescTable($tablename, 'entity');
 					if ($resql) {
 						$obj = $this->db->fetch_object($resql);
@@ -451,12 +451,12 @@ 
 										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 										$class = $objimport->array_import_convertvalue[0][$val]['class'];
 										$method = $objimport->array_import_convertvalue[0][$val]['method'];
-										if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval] != '') {
-											$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval];
+										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '') {
+											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
 										} else {
 											$resultload = dol_include_once($file);
 											if (empty($resultload)) {
-												dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
 												break;
 											}
 											$classinstance = new $class($this->db);
@@ -483,7 +483,7 @@ 
 												$param_array = array('', '', $newval);
 												call_user_func_array(array($classinstance, $method), $param_array);
 											}
-											$this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval] = $classinstance->id;
+											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
 											//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
 											if ($classinstance->id != '')	// id may be 0, it is a found value
 											{
@@ -509,19 +509,19 @@ 
 										$method = $objimport->array_import_convertvalue[0][$val]['method'];
 										$codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
 										$code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
-										if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval] != '') {
-											$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval];
+										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] != '') {
+											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval];
 										} else {
 											$resultload = dol_include_once($file);
 											if (empty($resultload)) {
-												dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', code=' . $code);
+												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', code='.$code);
 												break;
 											}
 											$classinstance = new $class($this->db);
 											// Try the fetch from code and ref
 											$param_array = array('', $newval, $code);
 											call_user_func_array(array($classinstance, $method), $param_array);
-											$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval] = $classinstance->id;
+											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
 											if ($classinstance->id > 0)    // we found record
 											{
 												$newval = $classinstance->id;
@@ -541,19 +541,19 @@ 
 									$class = $objimport->array_import_convertvalue[0][$val]['class'];
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
 									$units = $objimport->array_import_convertvalue[0][$val]['units'];
-									if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval] != '') {
-										$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval];
+									if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '') {
+										$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
 									} else {
 										$resultload = dol_include_once($file);
 										if (empty($resultload)) {
-											dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', units=' . $units);
+											dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
 											break;
 										}
 										$classinstance = new $class($this->db);
 										// Try the fetch from code or ref
 										call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
 										$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
-										$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval] = $scaleorid;
+										$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
 										//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
 										if ($classinstance->id > 0)	// we found record
 										{
@@ -599,8 +599,8 @@ 
 									$defaultref = '';
 									// TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
 									$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-									if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . ".php")) {
-										require_once DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . '.php';
+									if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php")) {
+										require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
 										$modTask = new $obj;
 										$defaultref = $modTask->getNextValue(null, null);
 									}
@@ -612,7 +612,7 @@ 
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
 									$resultload = dol_include_once($file);
 									if (empty($resultload)) {
-										dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+										dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
 										break;
 									}
 									$classinstance = new $class($this->db);
@@ -641,15 +641,15 @@ 
 									$table = $reg[2];
 									$filter = !empty($reg[3]) ? substr($reg[3], 1) : '';
 
-									$cachekey = $field . '@' . $table;
-									if (!empty($filter)) $cachekey .= ':' . $filter;
+									$cachekey = $field.'@'.$table;
+									if (!empty($filter)) $cachekey .= ':'.$filter;
 
 									// Load content of field@table into cache array
 									if (!is_array($this->cachefieldtable[$cachekey])) // If content of field@table not already loaded into cache
 									{
-										$sql = "SELECT " . $field . " as aliasfield FROM " . $table;
+										$sql = "SELECT ".$field." as aliasfield FROM ".$table;
 										if (!empty($filter)) {
-											$sql .= ' WHERE ' . $filter;
+											$sql .= ' WHERE '.$filter;
 										}
 
 										$resql = $this->db->query($sql);
@@ -669,7 +669,7 @@ 
 									// Now we check cache is not empty (should not) and key is into cache
 									if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey])) {
 										$tableforerror = $table;
-										if (!empty($filter)) $tableforerror .= ':' . $filter;
+										if (!empty($filter)) $tableforerror .= ':'.$filter;
 										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
 										$errorforthistable++;
@@ -677,7 +677,7 @@ 
 									}
 								}
 								// If test is just a static regex
-								elseif (!preg_match('/' . $objimport->array_import_regex[0][$val] . '/i', $newval)) {
+								elseif (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval)) {
 									//if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
 									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
 									$this->errors[$error]['type'] = 'REGEX';
@@ -696,7 +696,7 @@ 
 						// 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[] = "''";
-						else $listvalues[] = "'" . $this->db->escape($newval) . "'";
+						else $listvalues[] = "'".$this->db->escape($newval)."'";
 					}
 					$i++;
 				}
@@ -705,23 +705,23 @@ 
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0])) {
 					// Loop on each hidden fields to add them into listfields/listvalues
 					foreach ($objimport->array_import_fieldshidden[0] as $key => $val) {
-						if (!preg_match('/^' . preg_quote($alias, '/') . '\./', $key)) continue; // Not a field of current table
+						if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) continue; // Not a field of current table
 						if ($val == 'user->id') {
-							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
+							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
 							$listvalues[] = $user->id;
 						} elseif (preg_match('/^lastrowid-/', $val)) {
 							$tmp = explode('-', $val);
 							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
-							$keyfield = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
+							$keyfield = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
 							$listfields[] = $keyfield;
 							$listvalues[] = $lastinsertid;
 							//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
 						} elseif (preg_match('/^const-/', $val)) {
 							$tmp = explode('-', $val, 2);
-							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
-							$listvalues[] = "'" . $tmp[1] . "'";
+							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
+							$listvalues[] = "'".$tmp[1]."'";
 						} else {
-							$this->errors[$error]['lib'] = 'Bad value of profile setup ' . $val . ' for array_import_fieldshidden';
+							$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
 							$this->errors[$error]['type'] = 'Import profile setup';
 							$error++;
 						}
@@ -740,7 +740,7 @@ 
 							// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
 
 							if (empty($lastinsertid)) {	// No insert done yet for a parent table
-								$sqlSelect = 'SELECT rowid FROM ' . $tablename;
+								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$where = array();
@@ -748,10 +748,10 @@ 
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
 									$key = preg_replace('/^.*\./i', '', $key);
-									$where[] = $key . ' = ' . $data[$key];
-									$filters[] = $col . ' = ' . $data[$key];
+									$where[] = $key.' = '.$data[$key];
+									$filters[] = $col.' = '.$data[$key];
 								}
-								$sqlSelect .= ' WHERE ' . implode(' AND ', $where);
+								$sqlSelect .= ' WHERE '.implode(' AND ', $where);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
@@ -778,10 +778,10 @@ 
 								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
 								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
-								$sqlSelect = 'SELECT rowid FROM ' . $tablename;
+								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
 								if (empty($keyfield)) $keyfield = 'rowid';
-								$sqlSelect .= ' WHERE ' . $keyfield . ' = ' . $lastinsertid;
+								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
@@ -803,19 +803,19 @@ 
 
 							if (!empty($lastinsertid)) {
 								// Build SQL UPDATE request
-								$sqlstart = 'UPDATE ' . $tablename;
+								$sqlstart = 'UPDATE '.$tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$set = array();
 								foreach ($data as $key => $val) {
-									$set[] = $key . ' = ' . $val;
+									$set[] = $key.' = '.$val;
 								}
-								$sqlstart .= ' SET ' . implode(', ', $set);
+								$sqlstart .= ' SET '.implode(', ', $set);
 
 								if (empty($keyfield)) $keyfield = 'rowid';
-								$sqlend = ' WHERE ' . $keyfield . ' = ' . $lastinsertid;
+								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 
-								$sql = $sqlstart . $sqlend;
+								$sql = $sqlstart.$sqlend;
 
 								// Run update request
 								$resql = $this->db->query($sql);
@@ -834,17 +834,17 @@ 
 						// Update not done, we do insert
 						if (!$error && !$updatedone) {
 							// Build SQL INSERT request
-							$sqlstart = 'INSERT INTO ' . $tablename . '(' . implode(', ', $listfields) . ', import_key';
-							$sqlend = ') VALUES(' . implode(', ', $listvalues) . ", '" . $this->db->escape($importid) . "'";
+							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
+							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$this->db->escape($importid)."'";
 							if (!empty($tablewithentity_cache[$tablename])) {
 								$sqlstart .= ', entity';
-								$sqlend .= ', ' . $conf->entity;
+								$sqlend .= ', '.$conf->entity;
 							}
 							if (!empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart .= ', ' . $objimport->array_import_tables_creator[0][$alias];
-								$sqlend .= ', ' . $user->id;
+								$sqlstart .= ', '.$objimport->array_import_tables_creator[0][$alias];
+								$sqlend .= ', '.$user->id;
 							}
-							$sql = $sqlstart . $sqlend . ')';
+							$sql = $sqlstart.$sqlend.')';
 							dol_syslog("import_xlsx.modules", LOG_DEBUG);
 
 							// Run insert request

htdocs/categories/edit.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alphanohtml');
-$type = GETPOST('type', 'aZ09');		// Can be int or string
+$type = GETPOST('type', 'aZ09'); // Can be int or string
 $action = (GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'edit');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'alpha');

htdocs/compta/resultat/index.php

Spacing +2 added lines, -2 removed lines

@@ -864,12 +864,12 @@
 				$obj = $db->fetch_object($result);
 
 				if ($obj->pcg_type == 'INCOME') {
-					if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+					if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0; // To avoid warning of var not defined
 					$encaiss[$obj->dm] += $obj->credit;
 					$encaiss[$obj->dm] -= $obj->credit;
 				}
 				if ($obj->pcg_type == 'INCOME') {
-					if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+					if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0; // To avoid warning of var not defined
 					$decaiss[$obj->dm] += $obj->debit;
 					$decaiss[$obj->dm] -= $obj->credit;
 				}