Dolibarr / dolibarr

dev/build/generate_filelist_xml.php

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
  */
 
 if (!defined('NOREQUIREDB')) {
-	define('NOREQUIREDB', '1');	// Do not create database handler $db
+	define('NOREQUIREDB', '1'); // Do not create database handler $db
 }
 
 $sapi_type = php_sapi_name();
@@ -69,7 +69,7 @@ 
 $result = array();
 while ($i < $argc) {
 	if (!empty($argv[$i])) {
-		parse_str($argv[$i], $result);	// set all params $release, $includecustom, $includeconstant, $buildzip ...
+		parse_str($argv[$i], $result); // set all params $release, $includecustom, $includeconstant, $buildzip ...
 	}
 	if (!empty($result["release"])) {
 		$release = $result["release"];
@@ -78,9 +78,9 @@ 
 		$includecustom = $result["includecustom"];
 	}
 	if (preg_match('/includeconstant=/', strval($argv[$i]))) {
-		$tmp = explode(':', $result['includeconstant'], 3);			// $includeconstant has been set with previous parse_str()
+		$tmp = explode(':', $result['includeconstant'], 3); // $includeconstant has been set with previous parse_str()
 		if (count($tmp) != 3) {
-			print "Error: Bad parameter includeconstant=".$result['includeconstant'] ."\n";
+			print "Error: Bad parameter includeconstant=".$result['includeconstant']."\n";
 			exit(1);
 		}
 		$includeconstants[$tmp[0]][$tmp[1]] = $tmp[2];
@@ -158,7 +158,7 @@ 
 }
 
 $gitcommit = 'seetag';
-$branchname = preg_replace('/^(\d+\.\d+)\..*$/', '\1', $release);	// Keep only x.y into x.y.z
+$branchname = preg_replace('/^(\d+\.\d+)\..*$/', '\1', $release); // Keep only x.y into x.y.z
 $fileforgit = dirname(dirname(dirname(__FILE__))).'/.git/refs/heads/'.$branchname;
 print "Try to get last commit ID from file ".$fileforgit."\n";
 $fileforgitcontent = '';
@@ -189,7 +189,7 @@ 
 
 // Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php)
 $regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|escpos-php\/example|escpos-php\/test|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|escpos-php\/example|escpos-php\/test|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 
 $dir = '';
@@ -232,7 +232,7 @@ 
 fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
 
 $regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-$regextoexclude = '(custom|documents|conf|install)$';  // Exclude dirs
+$regextoexclude = '(custom|documents|conf|install)$'; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir = '';
 foreach ($files as $filetmp) {
@@ -273,7 +273,7 @@ 
 fputs($fp, '<dolibarr_unalterable_files version="'.$release.'">'."\n");
 
 $regextoinclude = '(\.php|\.sql)$';
-$regextoexclude = '';  // Exclude dirs
+$regextoexclude = ''; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../htdocs/blockedlog', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir = '';
 foreach ($files as $filetmp) {
@@ -301,7 +301,7 @@ 
 }
 // Add the SQL file
 $regextoinclude = 'llx_blockedlog.*(\.php|\.sql)$';
-$regextoexclude = '';  // Exclude dirs
+$regextoexclude = ''; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../htdocs/install/mysql/tables', 'files', 0, $regextoinclude, $regextoexclude, 'fullname');
 foreach ($files as $filetmp) {
 	$file = $filetmp['fullname'];
@@ -384,7 +384,7 @@ 
 	$needtoclose = 1;
 }
 
-$needtoclose = 1;	// This is the last file
+$needtoclose = 1; // This is the last file
 if (filetype($file) == "file") {
 	$md5 = md5_file($file);
 	$checksumconcat[] = $md5;

htdocs/admin/system/filecheck.php

Spacing +3 added lines, -3 removed lines

@@ -197,7 +197,7 @@ 
 	}
 }
 if (GETPOST('target') == 'remote') {
-	$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only. Same is used into api_setup.class.php.
+	$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into api_setup.class.php.
 
 	// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
 	if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != 400 && $xmlarray['http_code'] != 404) {
@@ -421,7 +421,7 @@ 
 						$out .= ' '.$form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helprm'.$i);
 					}
 					$out .= '</td>'."\n";
-					$out .= '<td class="center">'.dol_escape_htmltag((string) $file['expectedmd5']).'</td>'."\n";  // @phan-suppress-current-line PhanTypeInvalidDimOffset
+					$out .= '<td class="center">'.dol_escape_htmltag((string) $file['expectedmd5']).'</td>'."\n"; // @phan-suppress-current-line PhanTypeInvalidDimOffset
 					$out .= '<td class="center">'.dol_escape_htmltag($file['md5']).'</td>'."\n";
 					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
 					$totalsize += $size;
@@ -491,7 +491,7 @@ 
 			$resultcode = 'ok';
 			$resultcomment = 'Success';
 			$outcurrentchecksum = '<span class="'.$resultcode.'" title="Checksum of all current checksums concatenated separated by a comma">'.$checksumget.'</span>';
-			$outcurrentchecksum.= '<br><br>'.img_picto('', 'tick').' <span class="'.$resultcode.'">'.$langs->trans($resultcomment).'</span>';
+			$outcurrentchecksum .= '<br><br>'.img_picto('', 'tick').' <span class="'.$resultcode.'">'.$langs->trans($resultcomment).'</span>';
 		}
 	} else {
 		$resultcode = 'error';

htdocs/user/param_ihm.php

Spacing +4 added lines, -4 removed lines

@@ -314,7 +314,7 @@ 
 		$langs->trans($val['label']),
 		$val['picto'],
 		'class="pictofixedwidth"'
-	) . $langs->trans($val['label']);
+	).$langs->trans($val['label']);
 
 	$tmparray[$key]['label'] = $langs->trans($val['label']);
 }
@@ -430,7 +430,7 @@ 
 	print '<td>';
 	$s = picto_from_langcode(getDolGlobalString('MAIN_LANG_DEFAULT'));
 	print $s ? $s.' ' : '';
-	print (getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT')));
+	print (getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_".getDolGlobalString('MAIN_LANG_DEFAULT')));
 	print '</td>';
 	print '<td class="nowrap"><input class="oddeven" name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(getDolGlobalString('MAIN_LANG_DEFAULT') ? " checked" : "");
 	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
@@ -483,7 +483,7 @@ 
 
 	// Max size of short lists
 	print '<tr class="oddeven"><td>'.$langs->trans("MaxSizeShortList").'</td>';
-	print '<td>' . getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT').'</td>';
+	print '<td>'.getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT').'</td>';
 	print '<td class="nowrap" width="20%"><input class="oddeven" name="check_MAIN_SIZE_SHORTLIST_LIMIT" id="check_MAIN_SIZE_SHORTLIST_LIMIT" type="checkbox" '.(!empty($object->conf->MAIN_SIZE_SHORTLIST_LIMIT) ? " checked" : "");
 	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
 	print '> <label for="check_MAIN_SIZE_SHORTLIST_LIMIT">'.$langs->trans("UsePersonalValue").'</label></td>';
@@ -554,7 +554,7 @@ 
 	print '<td>';
 	$s = picto_from_langcode(getDolGlobalString('MAIN_LANG_DEFAULT'));
 	print ($s ? $s.' ' : '');
-	print (getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT')));
+	print (getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_".getDolGlobalString('MAIN_LANG_DEFAULT')));
 	print '</td>';
 	print '<td class="nowrap"><input class="oddeven" type="checkbox" disabled '.(!empty($object->conf->MAIN_LANG_DEFAULT) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
 	print '<td>';

htdocs/core/modules/accountancy/doc/pdf_bookkeeping.modules.php

Spacing +9 added lines, -9 removed lines

@@ -111,7 +111,7 @@ 
 		$this->watermark = '';
 
 		if ($mysoc === null) {
-			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR);
+			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR);
 			return;
 		}
 
@@ -215,7 +215,7 @@ 
 		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 		// Set path to the background PDF File
 		if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
-			$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+			$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 			$tplidx = $pdf->importPage(1);
 		}
 
@@ -224,7 +224,7 @@ 
 		$pdf->SetDrawColor(128, 128, 128);
 
 		if (method_exists($pdf, 'AliasNbPages')) {
-			$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+			$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 		}
 
 		$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
@@ -250,7 +250,7 @@ 
 		$pdf->MultiCell(0, 3, ''); // Set interline to 3
 		$pdf->SetTextColor(0, 0, 0);
 
-		$tab_top = 40;	// position of top tab
+		$tab_top = 40; // position of top tab
 		$tab_top_newpage = (getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 10 : $tab_top);
 
 		$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
@@ -285,7 +285,7 @@ 
 		$nbMonths = (((int) $toYear - (int) $fromYear) * 12) + ((int) $toMonth - (int) $fromMonth) + 1;
 		$datePlusOneMonth = strtotime("-1 month", $this->fromDate);
 		$dates = [];
-		for ($i = 0; $i  < $nbMonths; $i++) {
+		for ($i = 0; $i < $nbMonths; $i++) {
 			$datePlusOneMonth = strtotime("+1 month", $datePlusOneMonth);
 			$dates[$datePlusOneMonth] = dol_print_date($datePlusOneMonth, "%B %Y");
 		}
@@ -532,7 +532,7 @@ 
 		// Pagefoot
 		$this->_pagefoot($pdf, $object, $outputlangs);
 		if (method_exists($pdf, 'AliasNbPages')) {
-			$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+			$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 		}
 
 		$pdf->Close();
@@ -661,7 +661,7 @@ 
 		$pdf->SetXY($this->marge_gauche + 2, $nexY);
 		$pdf->SetTextColor(0, 0, 60);
 		$textDateNow = $outputlangs->transnoentities("PrintDate");
-		$pdf->MultiCell($w / 3, 3, $textDateNow . " : " . date('d/m/Y', dol_now()), '', 'L');
+		$pdf->MultiCell($w / 3, 3, $textDateNow." : ".date('d/m/Y', dol_now()), '', 'L');
 		$nexY = max($pdf->GetY(), $nexY);
 
 		// Page title
@@ -679,7 +679,7 @@ 
 
 		$fromDate = dol_print_date($this->fromDate, 'day');
 		$toDate = dol_print_date($this->toDate, 'day');
-		$textDate = $outputlangs->transnoentities("From") . " " . $fromDate . " " . $outputlangs->transnoentities("To") . " " . $toDate;
+		$textDate = $outputlangs->transnoentities("From")." ".$fromDate." ".$outputlangs->transnoentities("To")." ".$toDate;
 		$pdf->MultiCell($w / 3, 4, $textDate, 0, 'R');
 		$nexY = max($pdf->GetY(), $nexY);
 
@@ -956,7 +956,7 @@ 
 
 		if ($this->getColumnStatus('balance')) {
 			$solde = $credit - $debit;
-			$soldeText = price(price2num(abs($solde), 'MT')) . ($solde >= 0 ? ' ' . $langs->trans('CreditShort') : ' ' . $langs->trans('DebitShort'));
+			$soldeText = price(price2num(abs($solde), 'MT')).($solde >= 0 ? ' '.$langs->trans('CreditShort') : ' '.$langs->trans('DebitShort'));
 			$this->printStdColumnContent($pdf, $curY, 'balance', $soldeText);
 			$nexY = max($pdf->GetY(), $nexY);
 		}

htdocs/core/modules/accountancy/doc/pdf_ledger.modules.php

Spacing +11 added lines, -11 removed lines

@@ -101,7 +101,7 @@ 
 		$this->watermark = '';
 
 		if ($mysoc === null) {
-			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR);
+			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR);
 			return;
 		}
 
@@ -205,7 +205,7 @@ 
 		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 		// Set path to the background PDF File
 		if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
-			$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+			$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 			$tplidx = $pdf->importPage(1);
 		}
 
@@ -214,7 +214,7 @@ 
 		$pdf->SetDrawColor(128, 128, 128);
 
 		if (method_exists($pdf, 'AliasNbPages')) {
-			$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+			$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 		}
 
 		$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
@@ -240,7 +240,7 @@ 
 		$pdf->MultiCell(0, 3, ''); // Set interline to 3
 		$pdf->SetTextColor(0, 0, 0);
 
-		$tab_top = 40;	// position of top tab
+		$tab_top = 40; // position of top tab
 		$tab_top_newpage = (getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 10 : $tab_top);
 
 		$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
@@ -275,7 +275,7 @@ 
 		$nbMonths = (((int) $toYear - (int) $fromYear) * 12) + ((int) $toMonth - (int) $fromMonth) + 1;
 		$datePlusOneMonth = strtotime("-1 month", $this->fromDate);
 		$dates = [];
-		for ($i = 0; $i  < $nbMonths; $i++) {
+		for ($i = 0; $i < $nbMonths; $i++) {
 			$datePlusOneMonth = strtotime("+1 month", $datePlusOneMonth);
 			$dates[$datePlusOneMonth] = dol_print_date($datePlusOneMonth, "%B %Y");
 		}
@@ -312,7 +312,7 @@ 
 					$nexY,
 					$default_font_size,
 					'piece_num',
-					$langs->transnoentities('AccountAccountingShort') . ' ' . length_accountg($accountingAccount->ref) . ' - ' . $accountingAccount->label,
+					$langs->transnoentities('AccountAccountingShort').' '.length_accountg($accountingAccount->ref).' - '.$accountingAccount->label,
 					$tab_top_newpage
 				);
 
@@ -429,7 +429,7 @@ 
 
 			if ($this->getColumnStatus('balance')) {
 				$solde = $object->lines[$i]->credit - $object->lines[$i]->debit;
-				$soldeText = price(price2num(abs($solde), 'MT')) . ($solde >= 0 ? ' ' . $langs->trans('CreditShort') : ' ' . $langs->trans('DebitShort'));
+				$soldeText = price(price2num(abs($solde), 'MT')).($solde >= 0 ? ' '.$langs->trans('CreditShort') : ' '.$langs->trans('DebitShort'));
 				$this->printStdColumnContent($pdf, $curY, 'balance', $soldeText);
 				$nexY = max($pdf->GetY(), $nexY);
 			}
@@ -533,7 +533,7 @@ 
 		// Pagefoot
 		$this->_pagefoot($pdf, $object, $outputlangs);
 		if (method_exists($pdf, 'AliasNbPages')) {
-			$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+			$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 		}
 
 		$pdf->Close();
@@ -662,7 +662,7 @@ 
 		$pdf->SetXY($this->marge_gauche + 2, $nexY);
 		$pdf->SetTextColor(0, 0, 60);
 		$textDateNow = $outputlangs->transnoentities("PrintDate");
-		$pdf->MultiCell($w / 3, 3, $textDateNow . " : " . date('d/m/Y', dol_now()), '', 'L');
+		$pdf->MultiCell($w / 3, 3, $textDateNow." : ".date('d/m/Y', dol_now()), '', 'L');
 		$nexY = max($pdf->GetY(), $nexY);
 
 		// Page title
@@ -680,7 +680,7 @@ 
 
 		$fromDate = dol_print_date($this->fromDate, 'day');
 		$toDate = dol_print_date($this->toDate, 'day');
-		$textDate = $outputlangs->transnoentities("From") . " " . $fromDate . " " . $outputlangs->transnoentities("To") . " " . $toDate;
+		$textDate = $outputlangs->transnoentities("From")." ".$fromDate." ".$outputlangs->transnoentities("To")." ".$toDate;
 		$pdf->MultiCell($w / 3, 4, $textDate, 0, 'R');
 		$nexY = max($pdf->GetY(), $nexY);
 
@@ -977,7 +977,7 @@ 
 
 		if ($this->getColumnStatus('balance')) {
 			$solde = $credit - $debit;
-			$soldeText = price(price2num(abs($solde), 'MT')) . ($solde >= 0 ? ' ' . $langs->trans('CreditShort') : ' ' . $langs->trans('DebitShort'));
+			$soldeText = price(price2num(abs($solde), 'MT')).($solde >= 0 ? ' '.$langs->trans('CreditShort') : ' '.$langs->trans('DebitShort'));
 			$this->printStdColumnContent($pdf, $curY, 'balance', $soldeText);
 			$nexY = max($pdf->GetY(), $nexY);
 		}

htdocs/core/modules/accountancy/doc/pdf_balance.modules.php

Spacing +15 added lines, -15 removed lines

@@ -116,7 +116,7 @@ 
 		$this->watermark = '';
 
 		if ($mysoc === null) {
-			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR);
+			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR);
 			return;
 		}
 
@@ -220,7 +220,7 @@ 
 		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 		// Set path to the background PDF File
 		if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
-			$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+			$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 			$tplidx = $pdf->importPage(1);
 		}
 
@@ -229,7 +229,7 @@ 
 		$pdf->SetDrawColor(128, 128, 128);
 
 		if (method_exists($pdf, 'AliasNbPages')) {
-			$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+			$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 		}
 
 		$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
@@ -255,7 +255,7 @@ 
 		$pdf->MultiCell(0, 3, ''); // Set interline to 3
 		$pdf->SetTextColor(0, 0, 0);
 
-		$tab_top = 40;	// position of top tab
+		$tab_top = 40; // position of top tab
 		$tab_top_newpage = (getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 10 : $tab_top);
 
 		$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
@@ -289,7 +289,7 @@ 
 		$nbMonths = (((int) $toYear - (int) $fromYear) * 12) + ((int) $toMonth - (int) $fromMonth) + 1;
 		$datePlusOneMonth = strtotime("-1 month", $this->fromDate);
 		$dates = [];
-		for ($i = 0; $i  < $nbMonths; $i++) {
+		for ($i = 0; $i < $nbMonths; $i++) {
 			$datePlusOneMonth = strtotime("+1 month", $datePlusOneMonth);
 			$dates[$datePlusOneMonth] = dol_print_date($datePlusOneMonth, "%B %Y");
 		}
@@ -312,7 +312,7 @@ 
 					$curY,
 					$nexY,
 					$default_font_size,
-					$langs->trans('Total') . ' ' . $langs->trans('AccountancyGroup' . $accountGroup),
+					$langs->trans('Total').' '.$langs->trans('AccountancyGroup'.$accountGroup),
 					$tab_top_newpage,
 					$groupDebit,
 					$groupCredit
@@ -416,7 +416,7 @@ 
 
 			if ($this->getColumnStatus('balance')) {
 				$solde = $object->lines[$i]->credit - $object->lines[$i]->debit;
-				$soldeText = price(price2num(abs($solde), 'MT')) . ($solde >= 0 ? ' ' . $langs->trans('CreditShort') : ' ' . $langs->trans('DebitShort'));
+				$soldeText = price(price2num(abs($solde), 'MT')).($solde >= 0 ? ' '.$langs->trans('CreditShort') : ' '.$langs->trans('DebitShort'));
 				$this->printStdColumnContent($pdf, $curY, 'balance', $soldeText);
 				$nexY = max($pdf->GetY(), $nexY);
 			}
@@ -482,19 +482,19 @@ 
 				$this->addDashLine($pdf, $pdf->getPage(), $nexY);
 			}
 			// check if translation for AccountancyGroupXXX exists
-			$translationKey = 'AccountancyGroup' . $accountingAccount->pcg_type;
+			$translationKey = 'AccountancyGroup'.$accountingAccount->pcg_type;
 			$translation = $langs->transnoentitiesnoconv($translationKey);
 			if ($translation !== $translationKey) {
-				$output = $langs->transnoentitiesnoconv('Total') . ' ' . $translation;
+				$output = $langs->transnoentitiesnoconv('Total').' '.$translation;
 			} else {
-				$output = $langs->transnoentitiesnoconv('Total') . ' ' . $langs->transnoentitiesnoconv('AccountancyGroup') . ' ' . $accountingAccount->pcg_type;
+				$output = $langs->transnoentitiesnoconv('Total').' '.$langs->transnoentitiesnoconv('AccountancyGroup').' '.$accountingAccount->pcg_type;
 			}
 			$this->addTotalLine(
 				$pdf,
 				$curY,
 				$nexY,
 				$default_font_size,
-				$langs->transnoentitiesnoconv('Total') . ' ' . $langs->trans('AccountancyGroup' . $accountingAccount->pcg_type),
+				$langs->transnoentitiesnoconv('Total').' '.$langs->trans('AccountancyGroup'.$accountingAccount->pcg_type),
 				$tab_top_newpage,
 				$groupDebit,
 				$groupCredit
@@ -530,7 +530,7 @@ 
 		// Pagefoot
 		$this->_pagefoot($pdf, $object, $outputlangs);
 		if (method_exists($pdf, 'AliasNbPages')) {
-			$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+			$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 		}
 
 		$pdf->Close();
@@ -659,7 +659,7 @@ 
 		$pdf->SetXY($this->marge_gauche + 2, $nexY);
 		$pdf->SetTextColor(0, 0, 60);
 		$textDateNow = $outputlangs->transnoentities("PrintDate");
-		$pdf->MultiCell($w / 3, 3, $textDateNow . " : " . date('d/m/Y', dol_now()), '', 'L');
+		$pdf->MultiCell($w / 3, 3, $textDateNow." : ".date('d/m/Y', dol_now()), '', 'L');
 		$nexY = max($pdf->GetY(), $nexY);
 
 		// Page title
@@ -677,7 +677,7 @@ 
 
 		$fromDate = dol_print_date($this->fromDate, 'day');
 		$toDate = dol_print_date($this->toDate, 'day');
-		$textDate = $outputlangs->transnoentities("From") . " " . $fromDate . " " . $outputlangs->transnoentities("To") . " " . $toDate;
+		$textDate = $outputlangs->transnoentities("From")." ".$fromDate." ".$outputlangs->transnoentities("To")." ".$toDate;
 		$pdf->MultiCell($w / 3, 4, $textDate, 0, 'R');
 		$nexY = max($pdf->GetY(), $nexY);
 
@@ -917,7 +917,7 @@ 
 
 		if ($this->getColumnStatus('balance')) {
 			$solde = $credit - $debit;
-			$soldeText = price(price2num(abs($solde), 'MT')) . ($solde >= 0 ? ' ' . $langs->trans('CreditShort') : ' ' . $langs->trans('DebitShort'));
+			$soldeText = price(price2num(abs($solde), 'MT')).($solde >= 0 ? ' '.$langs->trans('CreditShort') : ' '.$langs->trans('DebitShort'));
 			$this->printStdColumnContent($pdf, $curY, 'balance', $soldeText);
 			$nexY = max($pdf->GetY(), $nexY);
 		}

htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php

Spacing +11 added lines, -11 removed lines

@@ -85,7 +85,7 @@ 
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
 		if ($mysoc === null) {
-			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR);
+			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR);
 			return;
 		}
 
@@ -180,7 +180,7 @@ 
 		$maxfilesizearray = getMaxFileSizeArray();
 		$maxmin = $maxfilesizearray['maxmin'];
 		if ($maxmin > 0) {
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 		}
 		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -273,7 +273,7 @@ 
 				if (getDolGlobalString('MAIN_ODT_AS_PDF_OMIT_TEMPLATE_NAME')) {
 					$newfiletmp = $objectref;
 				} else {
-					$newfiletmp = $objectref . '_' . $newfiletmp;
+					$newfiletmp = $objectref.'_'.$newfiletmp;
 				}
 
 				// Get extension (ods or odt)
@@ -283,11 +283,11 @@ 
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
-					$filename = $newfiletmp . '.' . $newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file = $dir . '/' . $filename;
+				$file = $dir.'/'.$filename;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
@@ -297,7 +297,7 @@ 
 				dol_mkdir($conf->facture->dir_temp);
 				if (!is_writable($conf->facture->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->facture->dir_temp);
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
 					return -1;
 				}
 
@@ -419,10 +419,10 @@ 
 				}
 
 				// Define substitution array
-				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);	// Set tags __...__
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object); // Set tags __...__
 				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_objet = $this->get_substitutionarray_object($object, $outputlangs);			// Set tags object_...
-				$array_user = $this->get_substitutionarray_user($user, $outputlangs);				// Set tags myuser_...
+				$array_objet = $this->get_substitutionarray_object($object, $outputlangs); // Set tags object_...
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs); // Set tags myuser_...
 				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
 				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
 				$array_propal = is_object($propal_object) ? $this->get_substitutionarray_object($propal_object, $outputlangs, 'propal') : array();
@@ -450,7 +450,7 @@ 
 				$tmparray['object_PREVIOUS_YEAR'] = dol_print_date(dol_time_plus_duree($object->date, -1, 'y'), '%Y');
 				$tmparray['object_YEAR'] = dol_print_date($object->date, '%Y');
 				$tmparray['object_NEXT_YEAR'] = dol_print_date(dol_time_plus_duree($object->date, 1, 'y'), '%Y');
-				$tmparray['object_productorservice_operation'] = $outputlangs->transnoentities("MentionCategoryOfOperations" . $categoryOfOperation);
+				$tmparray['object_productorservice_operation'] = $outputlangs->transnoentities("MentionCategoryOfOperations".$categoryOfOperation);
 
 
 				// Call the ODTSubstitution hook

htdocs/accountancy/supplier/list.php

Spacing +25 added lines, -25 removed lines

@@ -56,14 +56,14 @@ 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array:aZ09');	// Value can be 'X_Y'
+$toselect = GETPOST('toselect', 'array:aZ09'); // Value can be 'X_Y'
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancysupplierlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $default_account = GETPOSTINT('default_account');
 
 // Search Getpost
-$search_lineid = GETPOST('search_lineid', 'alpha');		// Can be '> 100'
+$search_lineid = GETPOST('search_lineid', 'alpha'); // Can be '> 100'
 $search_societe = GETPOST('search_societe', 'alpha');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
@@ -79,7 +79,7 @@ 
 $search_date_endday = GETPOSTINT('search_date_endday');
 $search_date_endmonth = GETPOSTINT('search_date_endmonth');
 $search_date_endyear = GETPOSTINT('search_date_endyear');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'aZ09');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -126,19 +126,19 @@ 
 }
 
 $arrayfields = array(
-	'l.rowid'               => array('label' => "LineId",                           'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'f.ref'                 => array('label' => "Invoice",                          'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'f.libelle'             => array('label' => "InvoiceLabel",                     'position' => 1, 'checked' => '-1', 'enabled' => '1'),
-	'f.datef'               => array('label' => "Date",                             'position' => 1, 'checked' => '1', 'enabled' => '1'), // f.datef, f.ref, l.rowid
-	'p.ref'                 => array('label' => "ProductRef",                       'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'l.description'         => array('label' => "ProductDescription",       		'position' => 1, 'checked' => '-1', 'enabled' => '1'),
-	'l.total_ht'            => array('label' => "Amount",                           'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'l.tva_tx'              => array('label' => "VATRate",                          'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	's.nom'                 => array('label' => "ThirdParty",                       'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'co.label'              => array('label' => "Country",                          'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	's.tva_intra'           => array('label' => "VATIntraShort",                    'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'aa.data_suggest'       => array('label' => "DataUsedToSuggestAccount",         'position' => 1, 'checked' => '1', 'enabled' => '1'), // Seems not used in search.
-	'aa.account_number'     => array('label' => "AccountAccountingSuggest",         'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'l.rowid'               => array('label' => "LineId", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'f.ref'                 => array('label' => "Invoice", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'f.libelle'             => array('label' => "InvoiceLabel", 'position' => 1, 'checked' => '-1', 'enabled' => '1'),
+	'f.datef'               => array('label' => "Date", 'position' => 1, 'checked' => '1', 'enabled' => '1'), // f.datef, f.ref, l.rowid
+	'p.ref'                 => array('label' => "ProductRef", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'l.description'         => array('label' => "ProductDescription", 'position' => 1, 'checked' => '-1', 'enabled' => '1'),
+	'l.total_ht'            => array('label' => "Amount", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'l.tva_tx'              => array('label' => "VATRate", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	's.nom'                 => array('label' => "ThirdParty", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'co.label'              => array('label' => "Country", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	's.tva_intra'           => array('label' => "VATIntraShort", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'aa.data_suggest'       => array('label' => "DataUsedToSuggestAccount", 'position' => 1, 'checked' => '1', 'enabled' => '1'), // Seems not used in search.
+	'aa.account_number'     => array('label' => "AccountAccountingSuggest", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
 );
 // @phpstan-ignore-next-line
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -305,20 +305,20 @@ 
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 }
 $alias_societe_perentity = !getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED') ? "s" : "spe";
 $alias_product_perentity = !getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p" : "ppe";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON " . $alias_product_perentity . ".accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON " . $alias_product_perentity . ".accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON " . $alias_product_perentity . ".accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_societe_perentity . ".accountancy_code_buy = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON ".$alias_product_perentity.".accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON ".$alias_product_perentity.".accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON ".$alias_product_perentity.".accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON ".$alias_societe_perentity.".accountancy_code_buy = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
 // Add table from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -534,7 +534,7 @@ 
 	$moreforfilter = '';
 
 	$varpage = $contextpage;
-	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
+	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields with user setup
 	$selectedfields = $htmlofselectarray;
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
@@ -759,7 +759,7 @@ 
 		$thirdpartystatic->email = $objp->email;
 		$thirdpartystatic->country_code = $objp->country_code;
 		$thirdpartystatic->tva_intra = $objp->tva_intra;
-		$thirdpartystatic->code_compta_product = $objp->company_code_buy;		// The accounting account for product stored on thirdparty object (for level3 suggestion)
+		$thirdpartystatic->code_compta_product = $objp->company_code_buy; // The accounting account for product stored on thirdparty object (for level3 suggestion)
 
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
@@ -837,7 +837,7 @@ 
 		if ($conf->main_checkbox_left_column) {
 			print '<td class="nowrap center actioncolumn">';
 			$selected = in_array($objp->rowid."_".$i, $toselect);
-			print '<input type="checkbox" class="flat checkforselect checkforselect'.$facturefourn_static_det->id.'" name="toselect[]" value="'.$facturefourn_static_det->id."_".$i.'"'.($selected ? " checked" : "").'/>';            print '</td>';
+			print '<input type="checkbox" class="flat checkforselect checkforselect'.$facturefourn_static_det->id.'" name="toselect[]" value="'.$facturefourn_static_det->id."_".$i.'"'.($selected ? " checked" : "").'/>'; print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}

htdocs/accountancy/customer/list.php

Spacing +25 added lines, -25 removed lines

@@ -54,7 +54,7 @@ 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array:aZ09');	// Value can be 'X_Y'
+$toselect = GETPOST('toselect', 'array:aZ09'); // Value can be 'X_Y'
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancycustomerlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
 
@@ -62,7 +62,7 @@ 
 
 // Search Getpost
 $search_societe = GETPOST('search_societe', 'alpha');
-$search_lineid = GETPOST('search_lineid', 'alpha');		// Can be '> 100'
+$search_lineid = GETPOST('search_lineid', 'alpha'); // Can be '> 100'
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -76,7 +76,7 @@ 
 $search_date_endday = GETPOSTINT('search_date_endday');
 $search_date_endmonth = GETPOSTINT('search_date_endmonth');
 $search_date_endyear = GETPOSTINT('search_date_endyear');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'aZ09');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -128,18 +128,18 @@ 
 }
 
 $arrayfields = array(
-	'l.rowid'               => array('label' => "LineId",                           'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'f.ref'                 => array('label' => "Invoice",                          'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'f.datef'               => array('label' => "Date",                             'position' => 1, 'checked' => '1', 'enabled' => '1'), // f.datef, f.ref, l.rowid
-	'p.ref'                 => array('label' => "ProductRef",                       'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'l.description'         => array('label' => "ProductDescription",       		'position' => 1, 'checked' => '-1', 'enabled' => '1'),
-	'l.total_ht'            => array('label' => "Amount",                           'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'l.tva_tx'              => array('label' => "VATRate",                          'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	's.nom'                 => array('label' => "ThirdParty",                       'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'co.label'              => array('label' => "Country",                          'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	's.tva_intra'           => array('label' => "VATIntraShort",                    'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'aa.data_suggest'       => array('label' => "DataUsedToSuggestAccount",         'position' => 1, 'checked' => '1', 'enabled' => '1'), // Seems not used in search.
-	'aa.account_number'     => array('label' => "AccountAccountingSuggest",         'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'l.rowid'               => array('label' => "LineId", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'f.ref'                 => array('label' => "Invoice", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'f.datef'               => array('label' => "Date", 'position' => 1, 'checked' => '1', 'enabled' => '1'), // f.datef, f.ref, l.rowid
+	'p.ref'                 => array('label' => "ProductRef", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'l.description'         => array('label' => "ProductDescription", 'position' => 1, 'checked' => '-1', 'enabled' => '1'),
+	'l.total_ht'            => array('label' => "Amount", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'l.tva_tx'              => array('label' => "VATRate", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	's.nom'                 => array('label' => "ThirdParty", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'co.label'              => array('label' => "Country", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	's.tva_intra'           => array('label' => "VATIntraShort", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'aa.data_suggest'       => array('label' => "DataUsedToSuggestAccount", 'position' => 1, 'checked' => '1', 'enabled' => '1'), // Seems not used in search.
+	'aa.account_number'     => array('label' => "AccountAccountingSuggest", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
 );
 // @phpstan-ignore-next-line
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -298,20 +298,20 @@ 
 $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as l ON f.rowid = l.fk_facture";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 }
 $alias_societe_perentity = !getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED') ? "s" : "spe";
 $alias_product_perentity = !getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p" : "ppe";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON " . $alias_product_perentity . ".accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON " . $alias_product_perentity . ".accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON " . $alias_product_perentity . ".accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_societe_perentity . ".accountancy_code_sell = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON ".$alias_product_perentity.".accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON ".$alias_product_perentity.".accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON ".$alias_product_perentity.".accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON ".$alias_societe_perentity.".accountancy_code_sell = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
 // Add table from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -521,7 +521,7 @@ 
 	$moreforfilter = '';
 
 	$varpage = $contextpage;
-	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
+	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields with user setup
 	$selectedfields = $htmlofselectarray;
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
@@ -713,7 +713,7 @@ 
 
 
 	$accountingaccount_codetotid_cache = array();
-	$suggestedaccountingaccountfor = '';  // Initialise (for static analysis)
+	$suggestedaccountingaccountfor = ''; // Initialise (for static analysis)
 	$suggestedaccountingaccountbydefaultfor = '';
 
 	while ($i < min($num_lines, $limit)) {
@@ -731,14 +731,14 @@ 
 		$thirdpartystatic->client = $objp->client;
 		$thirdpartystatic->fournisseur = $objp->fournisseur;
 		$thirdpartystatic->code_client = $objp->code_client;
-		$thirdpartystatic->code_compta = $objp->code_compta_client;		// For backward compatibility
+		$thirdpartystatic->code_compta = $objp->code_compta_client; // For backward compatibility
 		$thirdpartystatic->code_compta_client = $objp->code_compta_client;
 		$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
 		$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 		$thirdpartystatic->email = $objp->email;
 		$thirdpartystatic->country_code = $objp->country_code;
 		$thirdpartystatic->tva_intra = $objp->tva_intra;
-		$thirdpartystatic->code_compta_product = $objp->company_code_sell;		// The accounting account for product stored on thirdparty object (for level3 suggestion)
+		$thirdpartystatic->code_compta_product = $objp->company_code_sell; // The accounting account for product stored on thirdparty object (for level3 suggestion)
 
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;