Dolibarr / dolibarr

htdocs/admin/remotestore/class/externalModules.class.php

Spacing +27 added lines, -27 removed lines

@@ -202,12 +202,12 @@ 
 			$httpheader[] = 'Authorization: Basic '.base64_encode($basicAuthLogin.':'.$basicAuthPassword);
 		}
 
-		$url = $this->dolistore_api_url . (preg_match('/\/$/', $this->dolistore_api_url) ? '' : '/') . $resource;
+		$url = $this->dolistore_api_url.(preg_match('/\/$/', $this->dolistore_api_url) ? '' : '/').$resource;
 
 		$options['apikey'] = $this->dolistore_api_key;
 
 		if ($options) {
-			$url .= '?' . http_build_query($options);
+			$url .= '?'.http_build_query($options);
 		}
 
 		$url .= (preg_match('/\?/', $url) ? '&' : '?').'apikey='.$this->dolistore_api_key;
@@ -235,13 +235,13 @@ 
 		$modules = array();
 
 		if (!empty($this->cache_file) && file_exists($this->cache_file)) {
-			dol_syslog(__METHOD__ . " - Loading cache file: " . $this->cache_file, LOG_DEBUG);
+			dol_syslog(__METHOD__." - Loading cache file: ".$this->cache_file, LOG_DEBUG);
 
 			$content = file_get_contents($this->cache_file);
 			if ($content !== false) {
 				$modules = $this->readYaml($content);
 			} else {
-				dol_syslog(__METHOD__ . " - Error reading cache file", LOG_ERR);
+				dol_syslog(__METHOD__." - Error reading cache file", LOG_ERR);
 			}
 		}
 
@@ -269,20 +269,20 @@ 
 		if (isset($resCategories['response']) && is_array($resCategories['response'])) {
 			$organized_tree = $resCategories['response'];
 		} else {
-			return $html ;
+			return $html;
 		}
 
 		$html = '';
 		foreach ($organized_tree as $key => $value) {
 			if ($value['label'] != "Versions" && $value['label'] != "Specials") {
-				$html .= '<li' . ($current == $value['rowid'] ? ' class="active"' : '') . '>';
-				$html .= '<a href="?mode=marketplace&categorie=' . $value['rowid'] . '">' . $value['label'] . '</a>';
+				$html .= '<li'.($current == $value['rowid'] ? ' class="active"' : '').'>';
+				$html .= '<a href="?mode=marketplace&categorie='.$value['rowid'].'">'.$value['label'].'</a>';
 				if (isset($value['children'])) {
 					$html .= '<ul>';
 					usort($value['children'], $this->buildSorter('position'));
 					foreach ($value['children'] as $key_children => $value_children) {
-						$html .= '<li' . ($current == $value_children['rowid'] ? ' class="active"' : '') . '>';
-						$html .= '<a href="?mode=marketplace&categorie=' . $value_children['rowid'] . '" title="' . dol_escape_htmltag(strip_tags($value_children['description'])) . '">' . $value_children['label'] . '</a>';
+						$html .= '<li'.($current == $value_children['rowid'] ? ' class="active"' : '').'>';
+						$html .= '<a href="?mode=marketplace&categorie='.$value_children['rowid'].'" title="'.dol_escape_htmltag(strip_tags($value_children['description'])).'">'.$value_children['label'].'</a>';
 						$html .= '</li>';
 					}
 					$html .= '</ul>';
@@ -304,7 +304,7 @@ 
 
 		$html       = "";
 		$last_month = dol_now() - (30 * 24 * 60 * 60);
-		$dolibarrversiontouse = DOL_VERSION;	// full string with version
+		$dolibarrversiontouse = DOL_VERSION; // full string with version
 
 		$this->products = array();
 
@@ -313,7 +313,7 @@ 
 		$this->no_page  = $options['no_page'] ?? 1;
 		$this->search    = $options['search'] ?? '';
 
-		$this->per_page = 11;	// We fix number of products per page to 11
+		$this->per_page = 11; // We fix number of products per page to 11
 
 		// Length of $search must be at least 2 characters
 		if (!empty($this->search) && strlen(str_replace(' ', '', (string) $this->search)) < 2) {
@@ -354,7 +354,7 @@ 
 		$fileProducts = array();
 		$fileProductsTotal = 0;
 		if (!empty($this->githubFileStatus) && getDolGlobalInt('MAIN_ENABLE_EXTERNALMODULES_COMMUNITY')) {
-			$fileProducts = $this->fetchModulesFromFile($data);			// Return an array with all modules from the cache filecontent in $data
+			$fileProducts = $this->fetchModulesFromFile($data); // Return an array with all modules from the cache filecontent in $data
 
 			$fileProducts = $this->adaptData($fileProducts, 'githubcommunity');
 
@@ -383,7 +383,7 @@ 
 			 * @param array<string, mixed> $b Second product for comparison.
 			 * @return int
 			 */
-			static function ($a, $b) {
+			static function($a, $b) {
 				return strtotime($b['datec'] ?? '0') - strtotime($a['datec'] ?? '0');
 			}
 		);
@@ -422,7 +422,7 @@ 
 				if ($product['source'] === 'githubcommunity') {
 					$download_link = '<a class="paddingleft paddingright" target="_blank" href="'.$product["link"].'"><img width="32" src="'.DOL_URL_ROOT.'/admin/remotestore/img/follow.png" /></a>';
 					if (!empty($product['direct-download']) && $product['direct-download'] == 'yes') {
-						$urldownload = $product["dolistore-download"];		// In a future, we will have the download to the zip file
+						$urldownload = $product["dolistore-download"]; // In a future, we will have the download to the zip file
 						$reg = array();
 						if (preg_match('/https:.*\?id=(\d+)$/', $urldownload, $reg)) {
 							$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p='.$reg[1];
@@ -432,7 +432,7 @@ 
 				}
 
 				if ($product['source'] === 'dolistore') {
-					$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p=' . $product['id'];
+					$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p='.$product['id'];
 					$download_link = '<a class="paddingleft paddingright" target="_blank" href="'.$this->shop_url.'/product.php?id='.((int) $product["id"]).'"><img width="32" src="'.DOL_URL_ROOT.'/admin/remotestore/img/follow.png" /></a>';
 					$download_link .= '<a class="paddingleft paddingright" target="_blank" href="'.$urldownload.'" rel="noopener noreferrer"><img width="32" src="'.DOL_URL_ROOT.'/admin/remotestore/img/Download-128.png" /></a>';
 				}
@@ -455,7 +455,7 @@ 
 					$version = '<span class="notcompatible">'.$langs->trans(
 						'NotCompatible',
 						$dolibarrversiontouse,
-						(float)	$product["dolibarr_min"],
+						(float) $product["dolibarr_min"],
 						(float) $product["dolibarr_max"]
 					).'</span>';
 					$compatible = 'NotCompatible';
@@ -466,7 +466,7 @@ 
 					$version = '<span class="notcompatible">'.$langs->trans(
 						'NotCompatible',
 						$dolibarrversiontouse,
-						(float)	$product["dolibarr_min"],
+						(float) $product["dolibarr_min"],
 						(float) $product["dolibarr_max"]
 					).'</span>';
 					$compatible = 'NotCompatible';
@@ -485,12 +485,12 @@ 
 			// Output the line
 			$html .= '<tr class="app oddeven nohover '.dol_escape_htmltag($compatible).'">';
 			$html .= '<td class="center width150"><div class="newAppParent">';
-			$html .= $newapp.$images;	// No dol_escape_htmltag, it is already escape html
+			$html .= $newapp.$images; // No dol_escape_htmltag, it is already escape html
 			$html .= '</div></td>';
 			$html .= '<td class="margeCote"><h2 class="appTitle">';
 			$html .= dol_escape_htmltag(dol_string_nohtmltag($product["label"]));
 			$html .= '<br><small>';
-			$html .= $version;			// No dol_escape_htmltag, it is already escape html
+			$html .= $version; // No dol_escape_htmltag, it is already escape html
 			$html .= '</small></h2>';
 			$html .= '<small> ';
 			if (empty($product['tms'])) {
@@ -523,7 +523,7 @@ 
 
 		$this->numberOfProducts = count($this->products);
 
-		return $html ;
+		return $html;
 	}
 
 	/**
@@ -540,7 +540,7 @@ 
 		 * @param array<string, mixed> $b
 		 * @return int
 		 */
-		function (array $a, array $b) use ($key) {
+		function(array $a, array $b) use ($key) {
 			$valA = isset($a[$key]) && is_scalar($a[$key]) ? (string) $a[$key] : '';
 			$valB = isset($b[$key]) && is_scalar($b[$key]) ? (string) $b[$key] : '';
 
@@ -693,7 +693,7 @@ 
 				$pagelist .= '<li class="pagination">';
 				$pagelist .= '<label for="page_input">Page </label>';
 				if ($this->categorie != 0) {
-					$pagelist .= '<input type="hidden" name="categorie" value="' . $this->categorie . '">';
+					$pagelist .= '<input type="hidden" name="categorie" value="'.$this->categorie.'">';
 				}
 				$pagelist .= '<input type="text" id="page_input" name="no_page" value="'.($page).'" min="1" max="'.$nbpages.'" class="width40 page_input" oninput="if(this.value > '.$nbpages.') this.value='.$nbpages.'">';
 				$pagelist .= ' / '.$nbpages;
@@ -743,12 +743,12 @@ 
 		}
 
 		// Get the predefined error message or use a default one
-		$error_message = $error_messages[$request['status_code']] ?? 'Unexpected HTTP status: ' . $request['status_code'];
+		$error_message = $error_messages[$request['status_code']] ?? 'Unexpected HTTP status: '.$request['status_code'];
 
 		// Append error details if available
 		if (!empty($request['response']) && isset($request['response']['errors']) && is_array($request['response']['errors'])) {
 			foreach ($request['response']['errors'] as $error) {
-				$error_message .= ' - (Code ' . $error['code'] . '): ' . $error['message'];
+				$error_message .= ' - (Code '.$error['code'].'): '.$error['message'];
 			}
 		}
 
@@ -974,7 +974,7 @@ 
 			 *
 			 * @return int
 			 */
-			static function ($a, $b) {
+			static function($a, $b) {
 				return strtotime($b['datec'] ?? '0') - strtotime($a['datec'] ?? '0');
 			}
 		);
@@ -989,7 +989,7 @@ 
 				 *
 				 * @return bool
 				 */
-				static function ($package) use ($options) {
+				static function($package) use ($options) {
 					return stripos($package['label'], $options['search']) !== false || stripos($package['description'], $options['search']) !== false;
 				}
 			);
@@ -1005,7 +1005,7 @@ 
 				 *
 				 * @return bool
 				 */
-				static function ($package) use ($options) {
+				static function($package) use ($options) {
 					return in_array($options['categorieid'], $package['category']);
 				}
 			);

htdocs/core/lib/asset.lib.php

Spacing +17 added lines, -17 removed lines

@@ -95,32 +95,32 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Asset");
 	$head[$h][2] = 'card';
 	$h++;
 
 	if (empty($object->not_depreciated)) {
-		$head[$h][0] = DOL_URL_ROOT . '/asset/depreciation_options.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/depreciation_options.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("AssetDepreciationOptions");
 		$head[$h][2] = 'depreciation_options';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/accountancy_codes.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/accountancy_codes.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("AssetAccountancyCodes");
 	$head[$h][2] = 'accountancy_codes';
 	$h++;
 
 	if (empty($object->not_depreciated)) {
-		$head[$h][0] = DOL_URL_ROOT . '/asset/depreciation.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/depreciation.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("AssetDepreciation");
 		$head[$h][2] = 'depreciation';
 		$h++;
 	}
 
 	if (isset($object->disposal_date) && $object->disposal_date !== "") {
-		$head[$h][0] = DOL_URL_ROOT . '/asset/disposal.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/disposal.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("AssetDisposal");
 		$head[$h][2] = 'disposal';
 		$h++;
@@ -134,29 +134,29 @@ 
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT . '/asset/note.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
 
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-	$upload_dir = $conf->asset->dir_output . "/asset/" . dol_sanitizeFileName($object->ref);
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->asset->dir_output."/asset/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT . '/asset/document.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	}
 	$head[$h][2] = 'document';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/agenda.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
 	$h++;
@@ -191,7 +191,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/model/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -204,16 +204,16 @@ 
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT . '/asset/model/note.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/model/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/agenda.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/model/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
 	$h++;

htdocs/accountancy/supplier/list.php

Spacing +24 added lines, -24 removed lines

@@ -66,7 +66,7 @@ 
 $mesCasesCochees = GETPOST('toselect', 'array');
 
 // 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');
@@ -82,7 +82,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');
@@ -129,19 +129,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' => "ProducDescription",       		'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' => "ProducDescription", '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');
@@ -306,20 +306,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;
 
 $sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 $sql .= " AND l.product_type <= 2";
@@ -527,7 +527,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);
 
@@ -745,7 +745,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;
@@ -823,7 +823,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/supplier/lines.php

Spacing +17 added lines, -17 removed lines

@@ -56,7 +56,7 @@ 
 $changeaccount = GETPOST('changeaccount', 'array');
 // 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_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
@@ -71,7 +71,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');
@@ -116,18 +116,18 @@ 
 $formaccounting = new FormAccounting($db);
 
 $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' => "VATIntra",                         'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	   'aa.account_number'     => array('label' => "AccountAccounting",        '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' => "VATIntra", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	   'aa.account_number'     => array('label' => "AccountAccounting", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
 );
 // @phpstan-ignore-next-line
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -259,13 +259,13 @@ 
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
 $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);
 }
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_facture_fourn";
 $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 .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
@@ -435,7 +435,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);
 

htdocs/accountancy/customer/list.php

Spacing +24 added lines, -24 removed lines

@@ -66,7 +66,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');
@@ -80,7 +80,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');
@@ -132,18 +132,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');
@@ -303,20 +303,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;
 
 $sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 $sql .= " AND l.product_type <= 2";
@@ -518,7 +518,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);
 
@@ -701,7 +701,7 @@ 
 
 
 	$accountingaccount_codetotid_cache = array();
-	$suggestedaccountingaccountfor = '';  // Initialise (for static analysis)
+	$suggestedaccountingaccountfor = ''; // Initialise (for static analysis)
 	$suggestedaccountingaccountbydefaultfor = '';
 
 	while ($i < min($num_lines, $limit)) {
@@ -719,14 +719,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;

htdocs/accountancy/customer/lines.php

Spacing +16 added lines, -16 removed lines

@@ -69,7 +69,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');
@@ -109,22 +109,22 @@ 
 
 // Initialize technical objects
 $contextpage = 'accountancycustomerlines';
-$hookmanager->initHooks([$contextpage ]);
+$hookmanager->initHooks([$contextpage]);
 $formaccounting = new FormAccounting($db);
 
 
 $arrayfields = array(
-	'fd.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, fd.rowid
-	'p.ref' 				=> array('label' => "ProductRef", 			'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'fd.description' 		=> array('label' => "ProductDescription", 	'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'fd.total_ht' 			=> array('label' => "Amount", 				'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'fd.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' => "VATIntra", 			'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'aa.account_number' 	=> array('label' => "AccountAccounting", 	'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'fd.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, fd.rowid
+	'p.ref' 				=> array('label' => "ProductRef", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'fd.description' 		=> array('label' => "ProductDescription", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'fd.total_ht' 			=> array('label' => "Amount", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'fd.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' => "VATIntra", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'aa.account_number' 	=> array('label' => "AccountAccounting", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
 );
 // @phpstan-ignore-next-line
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -255,13 +255,13 @@ 
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.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);
 }
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 $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 .= " WHERE fd.fk_code_ventilation > 0";
@@ -427,7 +427,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);
 

htdocs/accountancy/journal/treasuryjournal.php

Spacing +9 added lines, -9 removed lines

@@ -96,7 +96,7 @@ 
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-$pastmonth = null;  // Initialise for static analysis  (could be really unseg)
+$pastmonth = null; // Initialise for static analysis  (could be really unseg)
 $pastmonthyear = null;
 
 if (empty($date_startmonth)) {
@@ -171,7 +171,7 @@ 
 			$tabpay[$obj->rowid] = array(
 				'id' => $obj->rowid,
 				'date' => $db->jdate($obj->do),
-				'type_payment' => $obj->fk_type,// CHQ, VIR, LIQ, CB, ...
+				'type_payment' => $obj->fk_type, // CHQ, VIR, LIQ, CB, ...
 				'ref' => $obj->label, // by default, not unique. May be changed later
 				'fk_bank_account' => $obj->fk_account,
 				'objects' => array(),
@@ -233,7 +233,7 @@ 
 				$sql .= " AND fd.product_type IN (0,1)";
 				$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".(!getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS') ? Facture::TYPE_DEPOSIT."," : "").Facture::TYPE_SITUATION.")";
 				$sql .= " AND bu.fk_bank IN (".$db->sanitize(implode(',', $ids)).")";
-				$sql .= " GROUP BY fd.rowid, bu.fk_bank, pf.amount, bu.url_id";	// TODO Must never have a GROUP BY on a field if field is not inside an aggregate function.
+				$sql .= " GROUP BY fd.rowid, bu.fk_bank, pf.amount, bu.url_id"; // TODO Must never have a GROUP BY on a field if field is not inside an aggregate function.
 				$sql .= " ORDER BY aa.account_number";
 
 				$resql = $db->query($sql);
@@ -269,7 +269,7 @@ 
 							$static_invoice->ref = $obj->ref;
 							$tabobject[$object_key] = array(
 								'id' => $obj->rowid,
-								'ref' => $obj->ref,		// It would be better to have a doc_ref that is 'BankId '.$obj->fk_bank.' - Facture FAzzz' and not just 'FAzzz' to be protected against duplicate, where xxx = $obj->fk_bank
+								'ref' => $obj->ref, // It would be better to have a doc_ref that is 'BankId '.$obj->fk_bank.' - Facture FAzzz' and not just 'FAzzz' to be protected against duplicate, where xxx = $obj->fk_bank
 								'total_ht' => $obj->invoice_total_ht,
 								'total_ttc' => $obj->invoice_total_ttc,
 								'url' => $static_invoice->getNomUrl(1),
@@ -382,7 +382,7 @@ 
 							$static_supplier_invoice->ref = $obj->ref;
 							$tabobject[$object_key] = array(
 								'id' => $obj->rowid,
-								'ref' => $obj->ref,		// It would be better to have a doc_ref that is 'BankId '.$obj->fk_bank.' - Facture FAzzz' and not just 'FAzzz' to be protected against duplicate, where xxx = $obj->fk_bank
+								'ref' => $obj->ref, // It would be better to have a doc_ref that is 'BankId '.$obj->fk_bank.' - Facture FAzzz' and not just 'FAzzz' to be protected against duplicate, where xxx = $obj->fk_bank
 								'total_ht' => -$obj->supplier_invoice_total_ht,
 								'total_ttc' => -$obj->supplier_invoice_total_ttc,
 								'url' => $static_supplier_invoice->getNomUrl(1),
@@ -915,7 +915,7 @@ 
 				} else {
 					$sql .= " LEFT JOIN ".$db->prefix()."accounting_bookkeeping as ab ON ab.fk_doc=bu.fk_bank AND ab.fk_docdet=pv.rowid";
 				}
-				$sql .= " WHERE pv.entity IN (".getEntity('payment_various', 0).')';    // We don't share object for accountancy, we use source object sharing
+				$sql .= " WHERE pv.entity IN (".getEntity('payment_various', 0).')'; // We don't share object for accountancy, we use source object sharing
 				$sql .= " AND bu.fk_bank IN (".$db->sanitize(implode(',', $ids)).")";
 				// Not already in bookkeeping
 				if ($in_bookkeeping == 'notyet') {
@@ -1308,7 +1308,7 @@ 
 				$error++;
 
 				if ($error >= $MAXNBERRORS) {
-					break;  // Break in the foreach
+					break; // Break in the foreach
 				}
 			}
 		}
@@ -1322,7 +1322,7 @@ 
 			$MAXNBERRORS = 5;
 			if ($error >= $MAXNBERRORS) {
 				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped").' (>'.$MAXNBERRORS.')', null, 'errors');
-				break;  // Break in the foreach
+				break; // Break in the foreach
 			}
 		}
 	}
@@ -1347,7 +1347,7 @@ 
 		$param .= '&date_endmonth='.$date_endmonth;
 		$param .= '&date_endyear='.$date_endyear;
 		$param .= '&in_bookkeeping='.$in_bookkeeping;
-		header("Location: " . $_SERVER['PHP_SELF'] . '?' . $param);
+		header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
 		exit;
 	}
 }

htdocs/accountancy/expensereport/list.php

Spacing +14 added lines, -14 removed lines

@@ -74,7 +74,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);
 
 // Define begin binding date
@@ -125,19 +125,19 @@ 
 
 
 $arrayfields = array(
-	'erd.rowid'             => array('label' => "LineId",                   	'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'u.login'               => array('label' => "Employees",                	'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'er.ref'               	=> array('label' => "ExpenseReport",            	'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'erd.date'              => array('label' => "DateOfLine",               	'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'f.label'               => array('label' => "TypeFees",                 	'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'erd.comments'        	=> array('label' => "Description",       			'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'erd.total_ht'          => array('label' => "Amount",                   	'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'erd.tva_tx'            => array('label' => "VATRate",                  	'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'),
+	'erd.rowid'             => array('label' => "LineId", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'u.login'               => array('label' => "Employees", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'er.ref'               	=> array('label' => "ExpenseReport", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'erd.date'              => array('label' => "DateOfLine", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'f.label'               => array('label' => "TypeFees", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'erd.comments'        	=> array('label' => "Description", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'erd.total_ht'          => array('label' => "Amount", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'erd.tva_tx'            => array('label' => "VATRate", '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'),
 );
 if (getDolGlobalString('ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE')) {
-	$arrayfields['er.date_valid'] = array('label' => "DateValidation",           'position' => 1, 'checked' => '1', 'enabled' => '1');
+	$arrayfields['er.date_valid'] = array('label' => "DateValidation", 'position' => 1, 'checked' => '1', 'enabled' => '1');
 }
 // @phpstan-ignore-next-line
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -192,7 +192,7 @@ 
 	$permissiontoread = $user->hasRight('accounting', 'read');
 	$permissiontodelete = $user->hasRight('accounting', 'delete');
 	$uploaddir = $conf->expensereport->dir_output;
-	include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -425,7 +425,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);
 

htdocs/accountancy/expensereport/lines.php

Spacing +13 added lines, -13 removed lines

@@ -51,7 +51,7 @@ 
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount', 'array');
 // Search Getpost
-$search_lineid = GETPOST('search_lineid', 'alpha');	// Can be '> 100'
+$search_lineid = GETPOST('search_lineid', 'alpha'); // Can be '> 100'
 $search_login = GETPOST('search_login', 'alpha');
 $search_expensereport = GETPOST('search_expensereport', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -65,7 +65,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);
 
 // Load variable for pagination
@@ -108,18 +108,18 @@ 
 
 
 $arrayfields = array(
-	'erd.rowid'             => array('label' => "LineId",                   'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'u.login'               => array('label' => "Employees",                'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'er.ref'               	=> array('label' => "ExpenseReport",            'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'erd.date'              => array('label' => "DateOfLine",               'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'f.label'               => array('label' => "TypeFees",                 'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'erd.comments'        	=> array('label' => "Description",       		'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'erd.total_ht'          => array('label' => "Amount",                   'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'erd.tva_tx'            => array('label' => "VATRate",                  'position' => 1, 'checked' => '1', 'enabled' => '1'),
-	'aa.account_number'     => array('label' => "AccountAccounting",        'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'erd.rowid'             => array('label' => "LineId", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'u.login'               => array('label' => "Employees", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'er.ref'               	=> array('label' => "ExpenseReport", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'erd.date'              => array('label' => "DateOfLine", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'f.label'               => array('label' => "TypeFees", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'erd.comments'        	=> array('label' => "Description", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'erd.total_ht'          => array('label' => "Amount", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'erd.tva_tx'            => array('label' => "VATRate", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
+	'aa.account_number'     => array('label' => "AccountAccounting", 'position' => 1, 'checked' => '1', 'enabled' => '1'),
 );
 if (getDolGlobalString('ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE')) {
-	$arrayfields['er.date_valid'] = array('label' => "DateValidation",           'position' => 1, 'checked' => '1', 'enabled' => '1');
+	$arrayfields['er.date_valid'] = array('label' => "DateValidation", 'position' => 1, 'checked' => '1', 'enabled' => '1');
 }
 // @phpstan-ignore-next-line
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -354,7 +354,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);