Inspection of "Daily Inspection: Merge pull request #36571 from W..." - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — develop (6b00f4)

unknown

created 2025-12-11 16:44 UTC

Status

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -41,23 +41,23 @@  discard block
 block discarded – undo
 // Return HTML header
 ?>
 <!DOCTYPE html>
-<?php print '<html lang="'.substr($langs->defaultlang, 0, 2) . '">'."\n"; ?>
+<?php print '<html lang="'.substr($langs->defaultlang, 0, 2).'">'."\n"; ?>
 <head>
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<title>
-		<?php print $title;	?>
+		<?php print $title; ?>
 	</title>
 	<?php
 
 
-	$jQueryUICSSUrl = $context->cdnUrl . '/jquery/css/base/jquery-ui.min.css?layout=classic';
+	$jQueryUICSSUrl = $context->cdnUrl.'/jquery/css/base/jquery-ui.min.css?layout=classic';
 	print '<link rel="stylesheet" href="'.$jQueryUICSSUrl.' ">'."\n";
 
 	//$jNotifyCSSUrl = $context->rootUrl.'includes/jquery/plugins/jnotify/jquery.jnotify.css';
 	//$jNotifyCSSUrl = dol_buildpath('/includes/jquery/plugins/jnotify/jquery.jnotify.min.css', 2);
-	$jNotifyCSSUrl =  $context->cdnUrl . '/jquery/plugins/jnotify/jquery.jnotify.min.css?layout=classic';
+	$jNotifyCSSUrl = $context->cdnUrl.'/jquery/plugins/jnotify/jquery.jnotify.min.css?layout=classic';
 	print '<link rel="stylesheet" href="'.$jNotifyCSSUrl.' ">'."\n";
 
 	?>
@@ -68,21 +68,21 @@  discard block
 block discarded – undo
 	<?php
 
 	// JQuery
-	$jQueryJSUrl =  $context->cdnUrl . '/jquery/js/jquery.min.js';
+	$jQueryJSUrl = $context->cdnUrl.'/jquery/js/jquery.min.js';
 	print '<script nonce="'.getNonce().'" src="'.$jQueryJSUrl.'"></script>'."\n";
 
-	$jQueryUIJSUrl =  $context->cdnUrl . '/jquery/js/jquery-ui.min.js';
+	$jQueryUIJSUrl = $context->cdnUrl.'/jquery/js/jquery-ui.min.js';
 	print '<script nonce="'.getNonce().'" src="'.$jQueryUIJSUrl.'"></script>'."\n";
 
 	// JNotify
 	//$jNotifyJSUrl = $context->rootUrl.'includes/jquery/plugins/jnotify/jquery.jnotify.js';
 	//$jNotifyJSUrl = dol_buildpath('/includes/jquery/plugins/jnotify/jquery.jnotify.min.js', 2);
-	$jNotifyJSUrl =  $context->cdnUrl . '/jquery/plugins/jnotify/jquery.jnotify.min.js';
+	$jNotifyJSUrl = $context->cdnUrl.'/jquery/plugins/jnotify/jquery.jnotify.min.js';
 	print '<script nonce="'.getNonce().'" src="'.$jNotifyJSUrl.'"></script>'."\n";
 
 	// SELECT 2
-	print '<link rel="stylesheet" href="'.$context->cdnUrl . '/jquery/plugins/select2/dist/css/select2.css">'."\n";
-	print '<script nonce="'.getNonce().'" src="'.$context->cdnUrl . '/jquery/plugins/select2/dist/js/select2.full.min.js"></script>'."\n";
+	print '<link rel="stylesheet" href="'.$context->cdnUrl.'/jquery/plugins/select2/dist/css/select2.css">'."\n";
+	print '<script nonce="'.getNonce().'" src="'.$context->cdnUrl.'/jquery/plugins/select2/dist/js/select2.full.min.js"></script>'."\n";
 
 	// Modal script
 	$ModalJSUrl = $context->rootUrl.'js/modal.js';
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
 	print '<script nonce="'.getNonce().'" src="'.$jQueryUIJSUrl.'"></script>'."\n";
 
 	$bodyAttributes = [
-		'data-theme' => $vars['body-theme']??'custom',
+		'data-theme' => $vars['body-theme'] ?? 'custom',
 		'data-controller' => $context->controller,
 	];
 

Please login to merge, or discard this patch.

htdocs/subtotals/class/commonsubtotal.class.php 1 patch

Spacing +161 added lines, -161 removed lines patch added patch discarded remove patch

@@ -119,110 +119,110 @@  discard block
 block discarded – undo
 				}
 			}
 
-			if ($max_existing_level+1 < $depth) {
-				$depth = $max_existing_level+1;
+			if ($max_existing_level + 1 < $depth) {
+				$depth = $max_existing_level + 1;
 				$this->errors[] = $langs->trans("TitleAddedLevelTooHigh", $depth);
 
-				$error ++;
+				$error++;
 			}
 		}
 
 		// Add the line calling the right module
 		if ($current_module == 'facture' && $this instanceof Facture) {
 			$result = $this->addline(
-				$desc,					// Description
-				0,						// Unit price
-				$depth,					// Quantity
-				0,						// VAT rate
-				0,						// Local tax 1
-				0,						// Local tax 2
-				0,						// FK product
-				0,						// Discount percentage
-				'',						// Date start
-				'',						// Date end
-				0,						// FK code ventilation
-				0,						// Info bits
-				0,						// FK remise except
-				'',						// Price base type
-				0,						// PU ttc
-				self::$PRODUCT_TYPE,	// Type
-				$rang,					// Rang
+				$desc, // Description
+				0, // Unit price
+				$depth, // Quantity
+				0, // VAT rate
+				0, // Local tax 1
+				0, // Local tax 2
+				0, // FK product
+				0, // Discount percentage
+				'', // Date start
+				'', // Date end
+				0, // FK code ventilation
+				0, // Info bits
+				0, // FK remise except
+				'', // Price base type
+				0, // PU ttc
+				self::$PRODUCT_TYPE, // Type
+				$rang, // Rang
 				SUBTOTALS_SPECIAL_CODE	// Special code
 			);
 		} elseif ($current_module == 'propal' && $this instanceof Propal) {
 			$result = $this->addline(
-				$desc,					// Description
-				0,						// Unit price
-				$depth,					// Quantity
-				0,						// VAT rate
-				0,						// Local tax 1
-				0,						// Local tax 2
-				0,						// FK product
-				0,						// Discount percentage
-				'',						// Price base type
-				0,						// PU ttc
-				0,						// Info bits
-				self::$PRODUCT_TYPE,	// Type
-				$rang,					// Rang
+				$desc, // Description
+				0, // Unit price
+				$depth, // Quantity
+				0, // VAT rate
+				0, // Local tax 1
+				0, // Local tax 2
+				0, // FK product
+				0, // Discount percentage
+				'', // Price base type
+				0, // PU ttc
+				0, // Info bits
+				self::$PRODUCT_TYPE, // Type
+				$rang, // Rang
 				SUBTOTALS_SPECIAL_CODE	// Special code
 			);
 		} elseif ($current_module == 'commande' && $this instanceof Commande) {
 			$result = $this->addline(
-				$desc,					// Description
-				0,						// Unit price
-				$depth,					// Quantity
-				0,						// VAT rate
-				0,						// Local tax 1
-				0,						// Local tax 2
-				0,						// FK product
-				0,						// Discount percentage
-				0,						// Info bits
-				0,						// FK remise except
-				'',						// Price base type
-				0,						// PU ttc
-				'',						// Date start
-				'',						// Date end
-				self::$PRODUCT_TYPE,	// Type
-				$rang,					// Rang
+				$desc, // Description
+				0, // Unit price
+				$depth, // Quantity
+				0, // VAT rate
+				0, // Local tax 1
+				0, // Local tax 2
+				0, // FK product
+				0, // Discount percentage
+				0, // Info bits
+				0, // FK remise except
+				'', // Price base type
+				0, // PU ttc
+				'', // Date start
+				'', // Date end
+				self::$PRODUCT_TYPE, // Type
+				$rang, // Rang
 				SUBTOTALS_SPECIAL_CODE	// Special code
 			);
 		} elseif ($current_module == 'shipping' && $this instanceof Expedition) {
 			$result = $this->addline(
-				0,						// Warehouse ID
-				(int) $parent_line,		// Source line
+				0, // Warehouse ID
+				(int) $parent_line, // Source line
 				$depth					// Quantity
 			);
 		} elseif ($current_module == 'facturerec' && $this instanceof FactureRec) {
-			$rang = $rang == -1 ? $rang : $rang-1;
+			$rang = $rang == -1 ? $rang : $rang - 1;
 			$result = $this->addline(
-				$desc,					// Description
-				0,						// Unit price
-				$depth,					// Quantity
-				0,						// VAT rate
-				0,						// Local tax 1
-				0,						// Local tax 2
-				0,						// FK product
-				0,						// Discount percentage
-				'',						// Price base type
-				0,						// Info bits
-				0,						// FK remise except
-				0,						// PU ttc
-				self::$PRODUCT_TYPE,	// Type
-				$rang,					// Rang
+				$desc, // Description
+				0, // Unit price
+				$depth, // Quantity
+				0, // VAT rate
+				0, // Local tax 1
+				0, // Local tax 2
+				0, // FK product
+				0, // Discount percentage
+				'', // Price base type
+				0, // Info bits
+				0, // FK remise except
+				0, // PU ttc
+				self::$PRODUCT_TYPE, // Type
+				$rang, // Rang
 				SUBTOTALS_SPECIAL_CODE	// Special code
 			);
 			$this->fetch_lines();
 		} elseif ($current_module == 'fichinter' && $this instanceof Fichinter) {
 			global $user;
 			$result = $this->addline(
-				$user,					// user
-				$this->id,				// fk_fichinter
-				$desc,					// Description
-				0,						// dateintervention
-				$depth,					// duration
-				[],						// arrayoption
-				self::$PRODUCT_TYPE,	// Type
-				$rang,					// Rang
+				$user, // user
+				$this->id, // fk_fichinter
+				$desc, // Description
+				0, // dateintervention
+				$depth, // duration
+				[], // arrayoption
+				self::$PRODUCT_TYPE, // Type
+				$rang, // Rang
 				SUBTOTALS_SPECIAL_CODE	// Special code
 			);
 		}
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
 
 		if ($correspondingstline) {
 			$oldDesc = "";
-			$oldDepth =  0;
+			$oldDepth = 0;
 			foreach ($this->lines as $line) {
 				if ($line->id == $id) {
 					$oldDesc = $line->desc;
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
 
 		$max_existing_level = 0;
 
-		if ($depth>0) {
+		if ($depth > 0) {
 			foreach ($this->lines as $line) {
 				if ($line->special_code == SUBTOTALS_SPECIAL_CODE && $line->qty > $max_existing_level && $line->id != $lineid) {
 					$max_existing_level = $line->qty;
@@ -345,15 +345,15 @@  discard block
 block discarded – undo
 			}
 		}
 
-		if ($max_existing_level+1 < $depth) {
-			$depth = $max_existing_level+1;
+		if ($max_existing_level + 1 < $depth) {
+			$depth = $max_existing_level + 1;
 			$this->errors[] = $langs->trans("TitleEditedLevelTooHigh");
-			$error ++;
+			$error++;
 		}
 
-		if ($depth>0) {
+		if ($depth > 0) {
 			$oldDesc = "";
-			$oldDepth =  0;
+			$oldDepth = 0;
 			foreach ($this->lines as $line) {
 				if ($line->id == $lineid) {
 					$oldDesc = $line->desc;
@@ -369,66 +369,66 @@  discard block
 block discarded – undo
 		// Update the line calling the right module
 		if ($current_module == 'facture' && $this instanceof Facture) {
 			$result = $this->updateline(
-				$lineid, 				// ID of line to change
-				$desc,					// Description
-				0,						// Unit price
-				$depth,					// Quantity
-				0,						// Discount percentage
-				'',						// Date start
-				'',						// Date end
-				0,						// VAT rate
-				0,						// Local tax 1
-				0,						// Local tax 2
-				'',						// Price base type
-				0, 						// Info bits
-				self::$PRODUCT_TYPE,	// Type
-				0,						// FK parent line
-				0,						// Skip update total
-				0,						// FK fournprice
-				0,						// PA ht
-				'',						// Label
+				$lineid, // ID of line to change
+				$desc, // Description
+				0, // Unit price
+				$depth, // Quantity
+				0, // Discount percentage
+				'', // Date start
+				'', // Date end
+				0, // VAT rate
+				0, // Local tax 1
+				0, // Local tax 2
+				'', // Price base type
+				0, // Info bits
+				self::$PRODUCT_TYPE, // Type
+				0, // FK parent line
+				0, // Skip update total
+				0, // FK fournprice
+				0, // PA ht
+				'', // Label
 				SUBTOTALS_SPECIAL_CODE	// Special code
 			);
 		} elseif ($current_module == 'propal' && $this instanceof Propal) {
 			$result = $this->updateline(
-				$lineid, 				// ID of line to change
-				0,						// Unit price
-				$depth,					// Quantity
-				0,						// Discount percentage
-				0,						// VAT rate
-				0,						// Local tax 1
-				0,						// Local tax 2
-				$desc,					// Description
-				'',						// Price base type
-				0,						// Info bits
+				$lineid, // ID of line to change
+				0, // Unit price
+				$depth, // Quantity
+				0, // Discount percentage
+				0, // VAT rate
+				0, // Local tax 1
+				0, // Local tax 2
+				$desc, // Description
+				'', // Price base type
+				0, // Info bits
 				SUBTOTALS_SPECIAL_CODE, // Special code
-				0, 						// FK parent line
-				0, 						// Skip update total
-				0, 						// FK fournprice
-				0, 						// PA ht
-				'',						// Label
+				0, // FK parent line
+				0, // Skip update total
+				0, // FK fournprice
+				0, // PA ht
+				'', // Label
 				self::$PRODUCT_TYPE		// Type
 			);
 		} elseif ($current_module == 'commande' && $this instanceof Commande) {
 			$result = $this->updateline(
-				$lineid, 				// ID of line to change
-				$desc,					// Description
-				0,						// Unit price
-				$depth,					// Quantity
-				0,						// Discount percentage
-				0,						// VAT rate
-				0,						// Local tax 1
-				0,						// Local tax 2
-				'',						// Price base type
-				0,						// Info bits
-				'',						// Date start
-				'',						// Date end
-				self::$PRODUCT_TYPE,	// Type
-				0, 						// FK parent line
-				0, 						// Skip update total
-				0, 						// FK fournprice
-				0, 						// PA ht
-				'',						// Label
+				$lineid, // ID of line to change
+				$desc, // Description
+				0, // Unit price
+				$depth, // Quantity
+				0, // Discount percentage
+				0, // VAT rate
+				0, // Local tax 1
+				0, // Local tax 2
+				'', // Price base type
+				0, // Info bits
+				'', // Date start
+				'', // Date end
+				self::$PRODUCT_TYPE, // Type
+				0, // FK parent line
+				0, // Skip update total
+				0, // FK fournprice
+				0, // PA ht
+				'', // Label
 				SUBTOTALS_SPECIAL_CODE	// Special code
 			);
 		} elseif ($current_module == 'facturerec' && $this instanceof FactureRec) {
@@ -436,21 +436,21 @@  discard block
 block discarded – undo
 			$objectline->fetch($lineid);
 			$line_rang = $objectline->rang;
 			$result = $this->updateline(
-				$lineid,				// ID of line to change
-				$desc,					// Description
-				0,						// Unit price
-				$depth,					// Quantity
-				0,						// VAT rate
-				0,						// Local tax 1
-				0,						// Local tax 2
-				0,						// FK parent line
-				0,						// Discount percentage
-				'',						// Price base type
-				0,						// Info bits
-				0,						// FK parent line
-				0,						// PU ttc
-				self::$PRODUCT_TYPE,	// Type
-				$line_rang,				// Rang
+				$lineid, // ID of line to change
+				$desc, // Description
+				0, // Unit price
+				$depth, // Quantity
+				0, // VAT rate
+				0, // Local tax 1
+				0, // Local tax 2
+				0, // FK parent line
+				0, // Discount percentage
+				'', // Price base type
+				0, // Info bits
+				0, // FK parent line
+				0, // PU ttc
+				self::$PRODUCT_TYPE, // Type
+				$line_rang, // Rang
 				SUBTOTALS_SPECIAL_CODE	// Special code
 			);
 		}
@@ -495,9 +495,9 @@  discard block
 block discarded – undo
 		$result = 0;
 		$linerang -= 1;
 
-		$nb_lines = count($this->lines)+1;
+		$nb_lines = count($this->lines) + 1;
 
-		for ($i = $linerang+1; $i < $nb_lines; $i++) {
+		for ($i = $linerang + 1; $i < $nb_lines; $i++) {
 			if ($this->lines[$i]->special_code == SUBTOTALS_SPECIAL_CODE) {
 				if (abs($this->lines[$i]->qty) <= (int) $this->lines[$linerang]->qty) {
 					return 1;
@@ -597,16 +597,16 @@  discard block
 block discarded – undo
 	public function getSubtotalLineAmount($line)
 	{
 		$final_amount = 0;
-		for ($i = $line->rang-1; $i > 0; $i--) {
-			if (is_null($this->lines[$i-1]) || $this->lines[$i-1]->rang >= $line->rang) {
+		for ($i = $line->rang - 1; $i > 0; $i--) {
+			if (is_null($this->lines[$i - 1]) || $this->lines[$i - 1]->rang >= $line->rang) {
 				continue;
 			}
-			if ($this->lines[$i-1]->special_code == SUBTOTALS_SPECIAL_CODE && $this->lines[$i-1]->qty > 0) {
-				if ($this->lines[$i-1]->qty <= abs($line->qty)) {
+			if ($this->lines[$i - 1]->special_code == SUBTOTALS_SPECIAL_CODE && $this->lines[$i - 1]->qty > 0) {
+				if ($this->lines[$i - 1]->qty <= abs($line->qty)) {
 					return price($final_amount);
 				}
 			} else {
-				$final_amount += $this->lines[$i-1]->total_ht;
+				$final_amount += $this->lines[$i - 1]->total_ht;
 			}
 		}
 		return price($final_amount);
@@ -624,16 +624,16 @@  discard block
 block discarded – undo
 	public function getSubtotalLineMulticurrencyAmount($line)
 	{
 		$final_amount = 0;
-		for ($i = $line->rang-1; $i > 0; $i--) {
-			if (is_null($this->lines[$i-1]) || $this->lines[$i-1]->rang >= $line->rang) {
+		for ($i = $line->rang - 1; $i > 0; $i--) {
+			if (is_null($this->lines[$i - 1]) || $this->lines[$i - 1]->rang >= $line->rang) {
 				continue;
 			}
-			if ($this->lines[$i-1]->special_code == SUBTOTALS_SPECIAL_CODE && $this->lines[$i-1]->qty>0) {
-				if ($this->lines[$i-1]->qty <= abs($line->qty)) {
+			if ($this->lines[$i - 1]->special_code == SUBTOTALS_SPECIAL_CODE && $this->lines[$i - 1]->qty > 0) {
+				if ($this->lines[$i - 1]->qty <= abs($line->qty)) {
 					return price($final_amount);
 				}
 			} else {
-				$final_amount += $this->lines[$i-1]->multicurrency_total_ht;
+				$final_amount += $this->lines[$i - 1]->multicurrency_total_ht;
 			}
 		}
 		return price($final_amount);
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
 		$toDisableLines = array();
 		$toDisable = true;
 		$oldDesc = "";
-		$oldDepth =  0;
+		$oldDepth = 0;
 
 		foreach ($this->lines as $titleLine) {
 			if ($titleLine->special_code != SUBTOTALS_SPECIAL_CODE || $titleLine->qty <= 0) {
@@ -720,7 +720,7 @@  discard block
 block discarded – undo
 						$toDisableLines = array_merge($toDisableLines, array($titleLine->id, $line->id));
 					}
 					$oldDesc = "";
-					$oldDepth =  0;
+					$oldDepth = 0;
 					$toDisable = true;
 					break;
 				}

Please login to merge, or discard this patch.

htdocs/core/class/html.formcompany.class.php 1 patch

Spacing +112 added lines, -112 removed lines patch added patch discarded remove patch

@@ -33,7 +33,7 @@  discard block
 block discarded – undo
  *	Only common components are here.
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle as label";
-		$sql .= " FROM " . $this->db->prefix() . "c_typent";
-		$sql .= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = " . (empty($mysoc->country_id) ? '0' : $mysoc->country_id) . ")";
+		$sql .= " FROM ".$this->db->prefix()."c_typent";
+		$sql .= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id) ? '0' : $mysoc->country_id).")";
 		if ($filter) {
-			$sql .= " " . $filter;
+			$sql .= " ".$filter;
 		}
 		$sql .= " ORDER by position, id";
-		dol_syslog(get_class($this) . '::typent_array', LOG_DEBUG);
+		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle as label";
-		$sql .= " FROM " . $this->db->prefix() . "c_effectif";
+		$sql .= " FROM ".$this->db->prefix()."c_effectif";
 		$sql .= " WHERE active = 1";
 		if ($filter) {
-			$sql .= " " . $filter;
+			$sql .= " ".$filter;
 		}
 		$sql .= " ORDER BY id ASC";
-		dol_syslog(get_class($this) . '::effectif_array', LOG_DEBUG);
+		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -153,13 +153,13 @@  discard block
 block discarded – undo
 		// phpcs:enable
 		global $user, $langs;
 
-		print '<form method="post" action="' . $page . '">';
+		print '<form method="post" action="'.$page.'">';
 		print '<input type="hidden" name="action" value="setprospectlevel">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-		dol_syslog(get_class($this) . '::form_prospect_level', LOG_DEBUG);
+		dol_syslog(get_class($this).'::form_prospect_level', LOG_DEBUG);
 		$sql = "SELECT code, label";
-		$sql .= " FROM " . $this->db->prefix() . "c_prospectlevel";
+		$sql .= " FROM ".$this->db->prefix()."c_prospectlevel";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
@@ -185,9 +185,9 @@  discard block
 block discarded – undo
 			dol_print_error($this->db);
 		}
 		if (!empty($htmlname) && $user->admin) {
-			print ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		print '<input type="submit" class="button button-save valignmiddle small" value="' . $langs->trans("Modify") . '">';
+		print '<input type="submit" class="button button-save valignmiddle small" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
 
@@ -204,13 +204,13 @@  discard block
 block discarded – undo
 	{
 		global $user, $langs;
 
-		print '<form method="post" action="' . $page . '">';
+		print '<form method="post" action="'.$page.'">';
 		print '<input type="hidden" name="action" value="setprospectcontactlevel">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$sql = "SELECT code, label";
-		$sql .= " FROM " . $this->db->prefix() . "c_prospectcontactlevel";
+		$sql .= " FROM ".$this->db->prefix()."c_prospectcontactlevel";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
@@ -236,9 +236,9 @@  discard block
 block discarded – undo
 			dol_print_error($this->db);
 		}
 		if (!empty($htmlname) && $user->admin) {
-			print ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		print '<input type="submit" class="button button-save valignmiddle small" value="' . $langs->trans("Modify") . '">';
+		print '<input type="submit" class="button button-save valignmiddle small" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
 
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
 		// phpcs:enable
 		global $conf, $langs, $user;
 
-		dol_syslog(get_class($this) . "::select_departement selected=" . $selected . ", country_codeid=" . $country_codeid, LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid, LOG_DEBUG);
 
 		$langs->load("dict");
 
@@ -287,28 +287,28 @@  discard block
 block discarded – undo
 
 		// Search departements/cantons/province active d'une region et pays actif
 		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
-		$sql .= " " . $this->db->prefix() . "c_departements as d, " . $this->db->prefix() . "c_regions as r," . $this->db->prefix() . "c_country as c";
+		$sql .= " ".$this->db->prefix()."c_departements as d, ".$this->db->prefix()."c_regions as r,".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
 		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
 		if ($country_codeid && is_numeric($country_codeid)) {
-			$sql .= " AND c.rowid = '" . $this->db->escape($country_codeid) . "'";
+			$sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
 		}
 		if ($country_codeid && !is_numeric($country_codeid)) {
-			$sql .= " AND c.code = '" . $this->db->escape($country_codeid) . "'";
+			$sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
 		}
 		$sql .= " ORDER BY c.code, d.code_departement";
 
 		$result = $this->db->query($sql);
 		if ($result) {
 			if (!empty($htmlname)) {
-				$out .= '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';
+				$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 			}
 			if ($country_codeid) {
 				$out .= '<option value="0">&nbsp;</option>';
 			}
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			dol_syslog(get_class($this) . "::select_departement num=" . $num, LOG_DEBUG);
+			dol_syslog(get_class($this)."::select_departement num=".$num, LOG_DEBUG);
 			if ($num) {
 				$country = '';
 				while ($i < $num) {
@@ -319,15 +319,15 @@  discard block
 block discarded – undo
 						if (!$country || $country != $obj->country) {
 							// Show break if we are in list with multiple countries
 							if (!$country_codeid && $obj->country_code) {
-								$out .= '<option value="-1" disabled data-html="----- ' . $obj->country . ' -----">----- ' . $obj->country . " -----</option>\n";
+								$out .= '<option value="-1" disabled data-html="----- '.$obj->country.' -----">----- '.$obj->country." -----</option>\n";
 								$country = $obj->country;
 							}
 						}
 
 						if (!empty($selected) && $selected == $obj->rowid) {
-							$out .= '<option value="' . $obj->rowid . '" selected>';
+							$out .= '<option value="'.$obj->rowid.'" selected>';
 						} else {
-							$out .= '<option value="' . $obj->rowid . '">';
+							$out .= '<option value="'.$obj->rowid.'">';
 						}
 
 						// Si traduction existe, on l'utilise, sinon on prend le libelle par default
@@ -336,13 +336,13 @@  discard block
 block discarded – undo
 							(getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 1 || getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 2 || getDolGlobalString('MAIN_SHOW_STATE_CODE') === 'all')
 						) {
 							if (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1) {
-								$out .= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+								$out .= $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							} else {
-								$out .= $obj->code . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+								$out .= $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 						} else {
 							if (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1) {
-								$out .= $obj->region_name . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+								$out .= $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							} else {
 								$out .= ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
 				$out .= '</select>';
 			}
 			if (!empty($htmlname) && $user->admin) {
-				$out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
 		} else {
 			dol_print_error($this->db);
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
 
 		// Make select dynamic
 		if (!empty($htmlname)) {
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
 		}
 
@@ -418,14 +418,14 @@  discard block
 block discarded – undo
 		$langs->load("dict");
 
 		$sql = "SELECT r.rowid, r.code_region as code, r.nom as label, r.active, c.code as country_code, c.label as country";
-		$sql .= " FROM " . $this->db->prefix() . "c_regions as r, " . $this->db->prefix() . "c_country as c";
+		$sql .= " FROM ".$this->db->prefix()."c_regions as r, ".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
 		$sql .= " ORDER BY c.code, c.label ASC";
 
-		dol_syslog(get_class($this) . "::select_region", LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			print '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '">';
+			print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num) {
@@ -437,16 +437,16 @@  discard block
 block discarded – undo
 					} else {
 						if ($country == '' || $country != $obj->country) {
 							// Show break
-							$key = $langs->trans("Country" . strtoupper($obj->country_code));
-							$valuetoshow = ($key != "Country" . strtoupper($obj->country_code)) ? $obj->country_code . " - " . $key : $obj->country;
-							print '<option value="-2" disabled>----- ' . $valuetoshow . " -----</option>\n";
+							$key = $langs->trans("Country".strtoupper($obj->country_code));
+							$valuetoshow = ($key != "Country".strtoupper($obj->country_code)) ? $obj->country_code." - ".$key : $obj->country;
+							print '<option value="-2" disabled>----- '.$valuetoshow." -----</option>\n";
 							$country = $obj->country;
 						}
 
 						if ($selected > 0 && $selected == $obj->code) {
-							print '<option value="' . $obj->code . '" selected>' . $obj->label . '</option>';
+							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
 						} else {
-							print '<option value="' . $obj->code . '">' . $obj->label . '</option>';
+							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
 						}
 					}
 					$i++;
@@ -477,13 +477,13 @@  discard block
 block discarded – undo
 
 		$out = '';
 
-		$sql = "SELECT rowid, code, label, active FROM " . $this->db->prefix() . "c_civility";
+		$sql = "SELECT rowid, code, label, active FROM ".$this->db->prefix()."c_civility";
 		$sql .= " WHERE active = 1";
 
 		dol_syslog("Form::select_civility", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';
+			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			$out .= '<option value="">&nbsp;</option>';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -491,12 +491,12 @@  discard block
 block discarded – undo
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					if ($selected == $obj->code) {
-						$out .= '<option value="' . $obj->code . '" selected>';
+						$out .= '<option value="'.$obj->code.'" selected>';
 					} else {
-						$out .= '<option value="' . $obj->code . '">';
+						$out .= '<option value="'.$obj->code.'">';
 					}
 					// If translation exists, we use it, otherwise, we use the hard coded label
-					$out .= ($langs->trans("Civility" . $obj->code) != "Civility" . $obj->code ? $langs->trans("Civility" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
+					$out .= ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
 					$out .= '</option>';
 					$i++;
 				}
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
 
 			if ($addjscombo) {
 				// Enhance with select2
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlname);
 			}
 		} else {
@@ -558,22 +558,22 @@  discard block
 block discarded – undo
 
 		// Lookup the active juridical types for the active countries
 		$sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
-		$sql .= " FROM " . $this->db->prefix() . "c_forme_juridique as f, " . $this->db->prefix() . "c_country as c";
+		$sql .= " FROM ".$this->db->prefix()."c_forme_juridique as f, ".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE f.fk_pays=c.rowid";
 		$sql .= " AND f.active = 1 AND c.active = 1";
 		if ($country_codeid) {
-			$sql .= " AND c.code = '" . $this->db->escape((string) $country_codeid) . "'";
+			$sql .= " AND c.code = '".$this->db->escape((string) $country_codeid)."'";
 		}
 		if ($filter) {
-			$sql .= " " . $filter;
+			$sql .= " ".$filter;
 		}
 		$sql .= " ORDER BY c.code";
 
-		dol_syslog(get_class($this) . "::select_juridicalstatus", LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$out .= '<div id="particulier2" class="visible">';
-			$out .= '<select class="flat minwidth200' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';
+			$out .= '<select class="flat minwidth200'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			if ($country_codeid) {
 				$out .= '<option value="0">&nbsp;</option>'; // When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
 			}
@@ -588,9 +588,9 @@  discard block
 block discarded – undo
 					$obj = $this->db->fetch_object($resql);
 
 					if ($obj->code) {		// We exclude empty line, we will add it later
-						$labelcountry = (($langs->trans("Country" . $obj->country_code) != "Country" . $obj->country_code) ? $langs->trans("Country" . $obj->country_code) : $obj->country);
-						$labeljs = (($langs->trans("JuridicalStatus" . $obj->code) != "JuridicalStatus" . $obj->code) ? $langs->trans("JuridicalStatus" . $obj->code) : ($obj->label != '-' ? $obj->label : '')); // $obj->label is already in output charset (converted by database driver)
-						$arraydata[(int) $obj->code] = array('code' => (int) $obj->code, 'label' => $labeljs, 'label_sort' => $labelcountry . '_' . $labeljs, 'country_code' => (string) $obj->country_code, 'country' => $labelcountry);
+						$labelcountry = (($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
+						$labeljs = (($langs->trans("JuridicalStatus".$obj->code) != "JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label != '-' ? $obj->label : '')); // $obj->label is already in output charset (converted by database driver)
+						$arraydata[(int) $obj->code] = array('code' => (int) $obj->code, 'label' => $labeljs, 'label_sort' => $labelcountry.'_'.$labeljs, 'country_code' => (string) $obj->country_code, 'country' => $labelcountry);
 					}
 					$i++;
 				}
@@ -604,15 +604,15 @@  discard block
 block discarded – undo
 					if (!$country || $country != $val['country']) {
 						// Show break when we are in multi country mode
 						if (empty($country_codeid) && $val['country_code']) {
-							$out .= '<option value="0" disabled class="selectoptiondisabledwhite">----- ' . $val['country'] . " -----</option>\n";
+							$out .= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
 							$country = $val['country'];
 						}
 					}
 
 					if ($selected > 0 && $selected == $val['code']) {
-						$out .= '<option value="' . $val['code'] . '" selected>';
+						$out .= '<option value="'.$val['code'].'" selected>';
 					} else {
-						$out .= '<option value="' . $val['code'] . '">';
+						$out .= '<option value="'.$val['code'].'">';
 					}
 					// If translation exists, we use it, otherwise we use default label in database
 					$out .= $val['label'];
@@ -621,11 +621,11 @@  discard block
 block discarded – undo
 			}
 			$out .= '</select>';
 			if ($user->admin) {
-				$out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
 
 			// Make select dynamic
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
 
 			$out .= '</div>';
@@ -679,13 +679,13 @@  discard block
 block discarded – undo
 			$events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 
 			if (count($events)) {	// If there is some ajax events to run once selection is done, we add code here to run events
-				print '<script nonce="' . getNonce() . '" type="text/javascript">
+				print '<script nonce="'.getNonce().'" type="text/javascript">
 				jQuery(document).ready(function() {
-					$("#search_' . $htmlname . '").change(function() {
-						var obj = ' . json_encode($events) . ';
+					$("#search_' . $htmlname.'").change(function() {
+						var obj = ' . json_encode($events).';
 						$.each(obj, function(key,values) {
 							if (values.method.length) {
-								runJsCodeForEvent' . $htmlname . '(values);
+								runJsCodeForEvent' . $htmlname.'(values);
 							}
 						});
 
@@ -693,13 +693,13 @@  discard block
 block discarded – undo
 					});
 
 					// Function used to execute events when search_htmlname change
-					function runJsCodeForEvent' . $htmlname . '(obj) {
-						var id = $("#' . $htmlname . '").val();
+					function runJsCodeForEvent' . $htmlname.'(obj) {
+						var id = $("#' . $htmlname.'").val();
 						var method = obj.method;
 						var url = obj.url;
 						var htmlname = obj.htmlname;
 						var showempty = obj.showempty;
-						console.log("Run runJsCodeForEvent-' . $htmlname . ' from selectCompaniesForNewContact id="+id+" method="+method+" showempty="+showempty+" url="+url+" htmlname="+htmlname);
+						console.log("Run runJsCodeForEvent-' . $htmlname.' from selectCompaniesForNewContact id="+id+" method="+method+" showempty="+showempty+" url="+url+" htmlname="+htmlname);
 						$.getJSON(url,
 							{
 								action: method,
@@ -729,9 +729,9 @@  discard block
 block discarded – undo
 				</script>';
 			}
 
-			print "\n" . '<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->' . "\n";
-			print '<input type="text" size="30" id="search_' . $htmlname . '" name="search_' . $htmlname . '" value="' . $name . '" />';
-			print ajax_autocompleter((string) ($socid ? $socid : -1), $htmlname, DOL_URL_ROOT . '/societe/ajax/ajaxcompanies.php', '', $minLength, 0);
+			print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
+			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
+			print ajax_autocompleter((string) ($socid ? $socid : -1), $htmlname, DOL_URL_ROOT.'/societe/ajax/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
 		} else {
 			// Search to list thirdparties
@@ -743,19 +743,19 @@  discard block
 block discarded – undo
 				$sql .= ", s.address, s.zip, s.town";
 				$sql .= ", dictp.code as country_code";
 			}
-			$sql .= " FROM " . $this->db->prefix() . "societe as s";
+			$sql .= " FROM ".$this->db->prefix()."societe as s";
 			if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
-				$sql .= " LEFT JOIN " . $this->db->prefix() . "c_country as dictp ON dictp.rowid = s.fk_pays";
+				$sql .= " LEFT JOIN ".$this->db->prefix()."c_country as dictp ON dictp.rowid = s.fk_pays";
 			}
 			// Filter on active third parties only (status = 1) Closed third parties must not be selectable
-			$sql .= " WHERE s.entity IN (" . getEntity('societe') . ")  AND s.status = 1";
+			$sql .= " WHERE s.entity IN (".getEntity('societe').")  AND s.status = 1";
 			// For ajax search we limit here. For combo list, we limit later
 			if (is_array($limitto) && count($limitto)) {
-				$sql .= " AND s.rowid IN (" . $this->db->sanitize(implode(',', $limitto)) . ")";
+				$sql .= " AND s.rowid IN (".$this->db->sanitize(implode(',', $limitto)).")";
 			}
 			// filter user access
 			if (!$user->hasRight('societe', 'client', 'voir') && !$user->socid) {
-				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = s.rowid AND sc.fk_user = ".(int) $user->id .")";
+				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = s.rowid AND sc.fk_user = ".(int) $user->id.")";
 			}
 			if ($user->socid > 0) {
 				$sql .= " AND s.rowid = ".((int) $user->socid);
@@ -768,17 +768,17 @@  discard block
 block discarded – undo
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
-				print '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlname . '" name="' . $htmlname . '"';
+				print '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"';
 				if ($conf->use_javascript_ajax) {
-					$javaScript = "window.location='" . dol_escape_js($_SERVER['PHP_SELF']) . "?" . $var_id . "=" . ($forceid > 0 ? $forceid : $object->id) . $moreparam . "&" . $htmlname . "=' + form." . $htmlname . ".options[form." . $htmlname . ".selectedIndex].value;";
-					print ' onChange="' . $javaScript . '"';
+					$javaScript = "window.location='".dol_escape_js($_SERVER['PHP_SELF'])."?".$var_id."=".($forceid > 0 ? $forceid : $object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
+					print ' onChange="'.$javaScript.'"';
 				}
 				print '>';
 				print '<option value="-1">&nbsp;</option>';
 
 				$num = $this->db->num_rows($resql);
 				$i = 0;
-				$firstCompany = 0;  // For static analysis
+				$firstCompany = 0; // For static analysis
 				if ($num) {
 					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
@@ -790,18 +790,18 @@  discard block
 block discarded – undo
 							$disabled = 1;
 						}
 						if ($selected > 0 && $selected == $obj->rowid) {
-							print '<option value="' . $obj->rowid . '"';
+							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) {
 								print ' disabled';
 							}
-							print ' selected>' . dol_escape_htmltag($obj->name, 0, 0, '', 0, 1) . '</option>';
+							print ' selected>'.dol_escape_htmltag($obj->name, 0, 0, '', 0, 1).'</option>';
 							$firstCompany = $obj->rowid;
 						} else {
-							print '<option value="' . $obj->rowid . '"';
+							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) {
 								print ' disabled';
 							}
-							print '>' . dol_escape_htmltag($obj->name, 0, 0, '', 0, 1) . '</option>';
+							print '>'.dol_escape_htmltag($obj->name, 0, 0, '', 0, 1).'</option>';
 						}
 						$i++;
 					}
@@ -836,10 +836,10 @@  discard block
 block discarded – undo
 
 		$out = '';
 		if (is_object($object) && method_exists($object, 'liste_type_contact')) {
-			'@phan-var-force CommonObject $object';  // CommonObject has the method.
-			$lesTypes = $object->liste_type_contact($source, $sortorder, 2, 1);	// List of types into c_type_contact for element=$object->element
+			'@phan-var-force CommonObject $object'; // CommonObject has the method.
+			$lesTypes = $object->liste_type_contact($source, $sortorder, 2, 1); // List of types into c_type_contact for element=$object->element
 
-			$out .= '<select class="flat valignmiddle' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';
+			$out .= '<select class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			if ($showempty) {
 				$out .= '<option value="0">&nbsp;</option>';
 			}
@@ -882,9 +882,9 @@  discard block
 block discarded – undo
 		if ($rendermode === 'view') {
 			$toprint = array();
 			foreach ($contact->roles as $key => $val) {
-				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb;">' . $val['label'] . '</li>';
+				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb;">'.$val['label'].'</li>';
 			}
-			return '<div class="select2-container-multi-dolibarr" style="width: 90%;" id="' . $htmlname . '"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+			return '<div class="select2-container-multi-dolibarr" style="width: 90%;" id="'.$htmlname.'"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
 
 		if ($rendermode === 'edit') {	// A multiselect combo list
@@ -930,14 +930,14 @@  discard block
 block discarded – undo
 
 		$size = '';
 		if (!empty($fieldsize)) {
-			$size = 'size="' . $fieldsize . '"';
+			$size = 'size="'.$fieldsize.'"';
 		}
 
 		if ($conf->use_javascript_ajax && empty($disableautocomplete)) {
-			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT . '/core/ajax/ziptown.php') . "\n";
+			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
 			$moreattrib .= ' autocomplete="off"';
 		}
-		$out .= '<input id="' . $htmlname . '" class="maxwidthonsmartphone' . ($morecss ? ' ' . $morecss : '') . '" type="text"' . ($moreattrib ? ' ' . $moreattrib : '') . ' name="' . $htmlname . '" ' . $size . ' value="' . $selected . '">' . "\n";
+		$out .= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss ? ' '.$morecss : '').'" type="text"'.($moreattrib ? ' '.$moreattrib : '').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
 
 		return $out;
 	}
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
 		$parameters = array('formlength' => $formlength, 'selected' => $preselected, 'idprof' => $idprof, 'htmlname' => $htmlname, 'country_code' => $country_code);
 		$reshook = $hookmanager->executeHooks('getInputIdProf', $parameters);
 		if (empty($reshook)) {
-			$out .= '<input type="text" ' . ($morecss ? 'class="' . $morecss . '" ' : '') . 'name="' . $htmlname . '" id="' . $htmlname . '" maxlength="' . $maxlength . '" value="' . $selected . '">';
+			$out .= '<input type="text" '.($morecss ? 'class="'.$morecss.'" ' : '').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
 		}
 		$out .= $hookmanager->resPrint;
 
@@ -1045,9 +1045,9 @@  discard block
 block discarded – undo
 				$i = 0;
 				while ($i < $nbvalues) {
 					if ($selected == $valors[$i]) {
-						print '<option value="' . $valors[$i] . '" selected>';
+						print '<option value="'.$valors[$i].'" selected>';
 					} else {
-						print '<option value="' . $valors[$i] . '">';
+						print '<option value="'.$valors[$i].'">';
 					}
 					print $valors[$i];
 					print '</option>';
@@ -1076,7 +1076,7 @@  discard block
 block discarded – undo
 			return '';
 		}
 
-		$out = '<select class="flat ' . $morecss . '" name="' . $htmlname . '" id="' . $htmlidname . '">';
+		$out = '<select class="flat '.$morecss.'" name="'.$htmlname.'" id="'.$htmlidname.'">';
 		if ($typeinput == 'form') {
 			if ($allowempty || ($selected == '' || $selected == '-1')) {
 				$out .= '<option value="-1">';
@@ -1088,33 +1088,33 @@  discard block
 block discarded – undo
 				$out .= '</option>';
 			}
 			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
-				$out .= '<option value="2"' . ($selected == 2 ? ' selected' : '') . '>' . $langs->trans('Prospect') . '</option>';
+				$out .= '<option value="2"'.($selected == 2 ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
 			}
 			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS')) {
-				$out .= '<option value="3"' . ($selected == 3 ? ' selected' : '') . '>' . $langs->trans('ProspectCustomer') . '</option>';
+				$out .= '<option value="3"'.($selected == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';
 			}
 			if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
-				$out .= '<option value="1"' . ($selected == 1 ? ' selected' : '') . '>' . $langs->trans('Customer') . '</option>';
+				$out .= '<option value="1"'.($selected == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
 			}
-			$out .= '<option value="0"' . ((string) $selected == '0' ? ' selected' : '') . '>' . $langs->trans('NorProspectNorCustomer') . '</option>';
+			$out .= '<option value="0"'.((string) $selected == '0' ? ' selected' : '').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
 		} elseif ($typeinput == 'list') {
-			$out .= '<option value="-1"' . (($selected == '' || $selected == '-1') ? ' selected' : '') . '>&nbsp;</option>';
+			$out .= '<option value="-1"'.(($selected == '' || $selected == '-1') ? ' selected' : '').'>&nbsp;</option>';
 			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
-				$out .= '<option value="2,3"' . ($selected == '2,3' ? ' selected' : '') . '>' . $langs->trans('Prospect') . '</option>';
+				$out .= '<option value="2,3"'.($selected == '2,3' ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
 			}
 			if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
-				$out .= '<option value="1,3"' . ($selected == '1,3' ? ' selected' : '') . '>' . $langs->trans('Customer') . '</option>';
+				$out .= '<option value="1,3"'.($selected == '1,3' ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
 			}
 			if (isModEnabled("fournisseur")) {
-				$out .= '<option value="4"' . ($selected == '4' ? ' selected' : '') . '>' . $langs->trans('Supplier') . '</option>';
+				$out .= '<option value="4"'.($selected == '4' ? ' selected' : '').'>'.$langs->trans('Supplier').'</option>';
 			}
-			$out .= '<option value="0"' . ($selected == '0' ? ' selected' : '') . '>' . $langs->trans('Other') . '</option>';
+			$out .= '<option value="0"'.($selected == '0' ? ' selected' : '').'>'.$langs->trans('Other').'</option>';
 		} elseif ($typeinput == 'admin') {
 			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS')) {
-				$out .= '<option value="3"' . ($selected == 3 ? ' selected' : '') . '>' . $langs->trans('ProspectCustomer') . '</option>';
+				$out .= '<option value="3"'.($selected == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';
 			}
 			if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
-				$out .= '<option value="1"' . ($selected == 1 ? ' selected' : '') . '>' . $langs->trans('Customer') . '</option>';
+				$out .= '<option value="1"'.($selected == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
 			}
 		}
 		$out .= '</select>';
@@ -1141,12 +1141,12 @@  discard block
 block discarded – undo
 
 		$out = '';
 		if ($htmlname != "none") {
-			$out .= '<form method="post" action="' . $page . '">';
+			$out .= '<form method="post" action="'.$page.'">';
 			$out .= '<input type="hidden" name="action" value="set_thirdpartytype">';
-			$out .= '<input type="hidden" name="token" value="' . newToken() . '">';
+			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$sortparam = getDolGlobalString('SOCIETE_SORT_ON_TYPEENT', 'ASC'); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 			$out .= $this->selectarray($htmlname, $this->typent_array(0, $filter), $selected, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
-			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';
+			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		} else {
 			if ($selected > 0) {
@@ -1185,7 +1185,7 @@  discard block
 block discarded – undo
 
 			//print $prospectstatic->LibProspCommStatut($statusprospect, 2, $prospectstatic->cacheprospectstatus[$statusprospect]['label'], $prospectstatic->cacheprospectstatus[$statusprospect]['picto']);
 			print img_action('', $actioncode, $actionpicto, 'class="inline-block valignmiddle paddingright pictoprospectstatus"');
-			print '<select class="flat selectprospectstatus maxwidth150" id="'. $htmlname.$idprospect .'" data-socid="'.$idprospect.'" name="' . $htmlname .'"';
+			print '<select class="flat selectprospectstatus maxwidth150" id="'.$htmlname.$idprospect.'" data-socid="'.$idprospect.'" name="'.$htmlname.'"';
 			if (!$user->hasRight('societe', 'creer')) {
 				print ' disabled';
 			}
@@ -1215,8 +1215,8 @@  discard block
 block discarded – undo
 						var image = $(this).prev(".pictoprospectstatus");
 						$.ajax({
 							type: "POST",
-							url: \'' . DOL_URL_ROOT . '/core/ajax/ajaxstatusprospect.php\',
-							data: { id: statusid, prospectid: prospectid, token: \''. newToken() .'\', action: \'updatestatusprospect\' },
+							url: \'' . DOL_URL_ROOT.'/core/ajax/ajaxstatusprospect.php\',
+							data: { id: statusid, prospectid: prospectid, token: \''. newToken().'\', action: \'updatestatusprospect\' },
 							success: function(response) {
 								console.log(response.img);
 								image.replaceWith(response.img);

Please login to merge, or discard this patch.

htdocs/core/modules/mailings/partnership.modules.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -259,7 +259,7 @@  discard block
 block discarded – undo
 			$num = $this->db->num_rows($resql);
 
 			if (!isModEnabled("partnership")) {
-				$num = 0;   // Force empty list if module is not enabled
+				$num = 0; // Force empty list if module is not enabled
 			}
 
 			if ($num) {
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
 		include_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
 		$tmppartnership = new Partnership($this->db);
 
-		$dummy = $tmppartnership->getLibStatut(0);	// We call this only to have $tmppartnership->labelStatus loaded
+		$dummy = $tmppartnership->getLibStatut(0); // We call this only to have $tmppartnership->labelStatus loaded
 
 		$s .= $form->selectarray('filter_status_partnership', $tmppartnership->labelStatus, GETPOST('filter_status_partnership'), $langs->trans("Status"));
 

Please login to merge, or discard this patch.

htdocs/core/menus/standard/eldy_menu.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -349,7 +349,7 @@  discard block
 block discarded – undo
 
 							// Add font-awesome for level 0 and 1 (if $val2['level'] == 1, we are on level2, if $val2['level'] == 2, we are on level 3...)
 							if ($val2['level'] == 0 && !empty($val2['prefix'])) {
-								print $val2['prefix'];	// the picto must have class="pictofixedwidth paddingright"
+								print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright"
 							} else {
 								print '<i class="fa fa-does-not-exists fa-fw paddingright pictofixedwidth level'.($val2['level'] + 1).'"></i>';
 							}
@@ -371,18 +371,18 @@  discard block
 block discarded – undo
 								$fromcursor = 0;
 								while ($fromcursor < ($currentlevel - $nextlevel)) {
 									print str_repeat(' ', $currentlevel - $fromcursor).'</ul>'."\n";
-									print str_repeat(' ', $currentlevel - $fromcursor - 1).'</li>'."\n";	// end level $val2['level']+1
+									print str_repeat(' ', $currentlevel - $fromcursor - 1).'</li>'."\n"; // end level $val2['level']+1
 									$fromcursor++;
 								}
 							} else {
-								print '</li>'."\n";	// end level $val2['level']+1
+								print '</li>'."\n"; // end level $val2['level']+1
 							}
 						}
 						//var_dump($submenu);
 					}
 
-					print str_repeat(' ', $level).'</ul>'."\n";			// end ul level 1
-					print str_repeat(' ', $level - 1).'</li>'."\n";			// end ul level 1
+					print str_repeat(' ', $level).'</ul>'."\n"; // end ul level 1
+					print str_repeat(' ', $level - 1).'</li>'."\n"; // end ul level 1
 				} elseif ($val['enabled'] == 2) {
 					print '<li class="lilevel0">';
 
@@ -397,10 +397,10 @@  discard block
 block discarded – undo
 					print $val['titre'];
 					print '</span>';
 
-					print '</li>'."\n";		// close entry level 0
+					print '</li>'."\n"; // close entry level 0
 				}
 			}
-			print '</ul>'."\n";		// close entry level 0
+			print '</ul>'."\n"; // close entry level 0
 		}
 
 		unset($this->menu);

Please login to merge, or discard this patch.

htdocs/core/menus/standard/auguria_menu.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -196,7 +196,7 @@  discard block
 block discarded – undo
 			// $this->menu->liste is top menu
 			//var_dump($this->menu->liste);exit;
 			$lastlevel = array();
-			$showmenu = true;  // Is current menu shown - define here to keep static code checker happy
+			$showmenu = true; // Is current menu shown - define here to keep static code checker happy
 			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
 			print '<ul class="ulmenu ullevel0" data-inset="true">'."\n";
 			foreach ($this->menu->liste as $key => $val) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
 
 							// Add font-awesome for level 0 and 1 (if $val2['level'] == 1, we are on level2, if $val2['level'] == 2, we are on level 3...)
 							if ($val2['level'] == 0 && !empty($val2['prefix'])) {
-								print $val2['prefix'];	// the picto must have class="pictofixedwidth paddingright"
+								print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright"
 							} else {
 								print '<i class="fa fa-does-not-exists fa-fw paddingright pictofixedwidth level'.($val2['level'] + 1).'"></i>';
 							}
@@ -380,17 +380,17 @@  discard block
 block discarded – undo
 								$fromcursor = 0;
 								while ($fromcursor < ($currentlevel - $nextlevel)) {
 									print str_repeat(' ', $currentlevel - $fromcursor).'</ul>'."\n";
-									print str_repeat(' ', $currentlevel - $fromcursor - 1).'</li>'."\n";	// end level $val2['level']+1
+									print str_repeat(' ', $currentlevel - $fromcursor - 1).'</li>'."\n"; // end level $val2['level']+1
 									$fromcursor++;
 								}
 							} else {
-								print '</li>'."\n";	// end level $val2['level']+1
+								print '</li>'."\n"; // end level $val2['level']+1
 							}
 						}
 					}
 
-					print str_repeat(' ', $level).'</ul>'."\n";			// end ul level 1
-					print str_repeat(' ', $level - 1).'</li>'."\n";			// end ul level 1
+					print str_repeat(' ', $level).'</ul>'."\n"; // end ul level 1
+					print str_repeat(' ', $level - 1).'</li>'."\n"; // end ul level 1
 				} elseif ($val['enabled'] == 2) {
 					print '<li class="lilevel0">';
 
@@ -405,10 +405,10 @@  discard block
 block discarded – undo
 					print $val['titre'];
 					print '</span>';
 
-					print '</li>'."\n";		// close entry level 0
+					print '</li>'."\n"; // close entry level 0
 				}
 			}
-			print '</ul>'."\n";		// close entry level 0
+			print '</ul>'."\n"; // close entry level 0
 		}
 
 		unset($this->menu);

Please login to merge, or discard this patch.

		@@ -259,7 +259,7 @@ discard block
		block discarded – undo
259	259	$num = $this->db->num_rows($resql);
260	260
261	261	if (!isModEnabled("partnership")) {
262		- $num = 0; // Force empty list if module is not enabled
	262	+ $num = 0; // Force empty list if module is not enabled
263	263	}
264	264
265	265	if ($num) {
		@@ -285,7 +285,7 @@ discard block
		block discarded – undo
285	285	include_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
286	286	$tmppartnership = new Partnership($this->db);
287	287
288		- $dummy = $tmppartnership->getLibStatut(0); // We call this only to have $tmppartnership->labelStatus loaded
	288	+ $dummy = $tmppartnership->getLibStatut(0); // We call this only to have $tmppartnership->labelStatus loaded
289	289
290	290	$s .= $form->selectarray('filter_status_partnership', $tmppartnership->labelStatus, GETPOST('filter_status_partnership'), $langs->trans("Status"));
291	291

		@@ -349,7 +349,7 @@ discard block
		block discarded – undo
349	349
350	350	// Add font-awesome for level 0 and 1 (if $val2['level'] == 1, we are on level2, if $val2['level'] == 2, we are on level 3...)
351	351	if ($val2['level'] == 0 && !empty($val2['prefix'])) {
352		- print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright"
	352	+ print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright"
353	353	} else {
354	354	print '<i class="fa fa-does-not-exists fa-fw paddingright pictofixedwidth level'.($val2['level'] + 1).'"></i>';
355	355	}
		@@ -371,18 +371,18 @@ discard block
		block discarded – undo
371	371	$fromcursor = 0;
372	372	while ($fromcursor < ($currentlevel - $nextlevel)) {
373	373	print str_repeat(' ', $currentlevel - $fromcursor).'</ul>'."\n";
374		- print str_repeat(' ', $currentlevel - $fromcursor - 1).'</li>'."\n"; // end level $val2['level']+1
	374	+ print str_repeat(' ', $currentlevel - $fromcursor - 1).'</li>'."\n"; // end level $val2['level']+1
375	375	$fromcursor++;
376	376	}
377	377	} else {
378		- print '</li>'."\n"; // end level $val2['level']+1
	378	+ print '</li>'."\n"; // end level $val2['level']+1
379	379	}
380	380	}
381	381	//var_dump($submenu);
382	382	}
383	383
384		- print str_repeat(' ', $level).'</ul>'."\n"; // end ul level 1
385		- print str_repeat(' ', $level - 1).'</li>'."\n"; // end ul level 1
	384	+ print str_repeat(' ', $level).'</ul>'."\n"; // end ul level 1
	385	+ print str_repeat(' ', $level - 1).'</li>'."\n"; // end ul level 1
386	386	} elseif ($val['enabled'] == 2) {
387	387	print '<li class="lilevel0">';
388	388
		@@ -397,10 +397,10 @@ discard block
		block discarded – undo
397	397	print $val['titre'];
398	398	print '</span>';
399	399
400		- print '</li>'."\n"; // close entry level 0
	400	+ print '</li>'."\n"; // close entry level 0
401	401	}
402	402	}
403		- print '</ul>'."\n"; // close entry level 0
	403	+ print '</ul>'."\n"; // close entry level 0
404	404	}
405	405
406	406	unset($this->menu);

		@@ -196,7 +196,7 @@ discard block
		block discarded – undo
196	196	// $this->menu->liste is top menu
197	197	//var_dump($this->menu->liste);exit;
198	198	$lastlevel = array();
199		- $showmenu = true; // Is current menu shown - define here to keep static code checker happy
	199	+ $showmenu = true; // Is current menu shown - define here to keep static code checker happy
200	200	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
201	201	print '<ul class="ulmenu ullevel0" data-inset="true">'."\n";
202	202	foreach ($this->menu->liste as $key => $val) { // $val['url','titre','level','enabled'=0\|1\|2,'target','mainmenu','leftmenu'
		@@ -357,7 +357,7 @@ discard block
		block discarded – undo
357	357
358	358	// Add font-awesome for level 0 and 1 (if $val2['level'] == 1, we are on level2, if $val2['level'] == 2, we are on level 3...)
359	359	if ($val2['level'] == 0 && !empty($val2['prefix'])) {
360		- print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright"
	360	+ print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright"
361	361	} else {
362	362	print '<i class="fa fa-does-not-exists fa-fw paddingright pictofixedwidth level'.($val2['level'] + 1).'"></i>';
363	363	}
		@@ -380,17 +380,17 @@ discard block
		block discarded – undo
380	380	$fromcursor = 0;
381	381	while ($fromcursor < ($currentlevel - $nextlevel)) {
382	382	print str_repeat(' ', $currentlevel - $fromcursor).'</ul>'."\n";
383		- print str_repeat(' ', $currentlevel - $fromcursor - 1).'</li>'."\n"; // end level $val2['level']+1
	383	+ print str_repeat(' ', $currentlevel - $fromcursor - 1).'</li>'."\n"; // end level $val2['level']+1
384	384	$fromcursor++;
385	385	}
386	386	} else {
387		- print '</li>'."\n"; // end level $val2['level']+1
	387	+ print '</li>'."\n"; // end level $val2['level']+1
388	388	}
389	389	}
390	390	}
391	391
392		- print str_repeat(' ', $level).'</ul>'."\n"; // end ul level 1
393		- print str_repeat(' ', $level - 1).'</li>'."\n"; // end ul level 1
	392	+ print str_repeat(' ', $level).'</ul>'."\n"; // end ul level 1
	393	+ print str_repeat(' ', $level - 1).'</li>'."\n"; // end ul level 1
394	394	} elseif ($val['enabled'] == 2) {
395	395	print '<li class="lilevel0">';
396	396
		@@ -405,10 +405,10 @@ discard block
		block discarded – undo
405	405	print $val['titre'];
406	406	print '</span>';
407	407
408		- print '</li>'."\n"; // close entry level 0
	408	+ print '</li>'."\n"; // close entry level 0
409	409	}
410	410	}
411		- print '</ul>'."\n"; // close entry level 0
	411	+ print '</ul>'."\n"; // close entry level 0
412	412	}
413	413
414	414	unset($this->menu);

		@@ -41,23 +41,23 @@ discard block
		block discarded – undo
41	41	// Return HTML header
42	42	?>
43	43	<!DOCTYPE html>
44		-<?php print '<html lang="'.substr($langs->defaultlang, 0, 2) . '">'."\n"; ?>
	44	+<?php print '<html lang="'.substr($langs->defaultlang, 0, 2).'">'."\n"; ?>
45	45	<head>
46	46	<meta charset="UTF-8">
47	47	<meta name="viewport" content="width=device-width, initial-scale=1.0">
48	48	<meta http-equiv="X-UA-Compatible" content="ie=edge">
49	49	<title>
50		- <?php print $title; ?>
	50	+ <?php print $title; ?>
51	51	</title>
52	52	<?php
53	53
54	54
55		- $jQueryUICSSUrl = $context->cdnUrl . '/jquery/css/base/jquery-ui.min.css?layout=classic';
	55	+ $jQueryUICSSUrl = $context->cdnUrl.'/jquery/css/base/jquery-ui.min.css?layout=classic';
56	56	print '<link rel="stylesheet" href="'.$jQueryUICSSUrl.' ">'."\n";
57	57
58	58	//$jNotifyCSSUrl = $context->rootUrl.'includes/jquery/plugins/jnotify/jquery.jnotify.css';
59	59	//$jNotifyCSSUrl = dol_buildpath('/includes/jquery/plugins/jnotify/jquery.jnotify.min.css', 2);
60		- $jNotifyCSSUrl = $context->cdnUrl . '/jquery/plugins/jnotify/jquery.jnotify.min.css?layout=classic';
	60	+ $jNotifyCSSUrl = $context->cdnUrl.'/jquery/plugins/jnotify/jquery.jnotify.min.css?layout=classic';
61	61	print '<link rel="stylesheet" href="'.$jNotifyCSSUrl.' ">'."\n";
62	62
63	63	?>
		@@ -68,21 +68,21 @@ discard block
		block discarded – undo
68	68	<?php
69	69
70	70	// JQuery
71		- $jQueryJSUrl = $context->cdnUrl . '/jquery/js/jquery.min.js';
	71	+ $jQueryJSUrl = $context->cdnUrl.'/jquery/js/jquery.min.js';
72	72	print '<script nonce="'.getNonce().'" src="'.$jQueryJSUrl.'"></script>'."\n";
73	73
74		- $jQueryUIJSUrl = $context->cdnUrl . '/jquery/js/jquery-ui.min.js';
	74	+ $jQueryUIJSUrl = $context->cdnUrl.'/jquery/js/jquery-ui.min.js';
75	75	print '<script nonce="'.getNonce().'" src="'.$jQueryUIJSUrl.'"></script>'."\n";
76	76
77	77	// JNotify
78	78	//$jNotifyJSUrl = $context->rootUrl.'includes/jquery/plugins/jnotify/jquery.jnotify.js';
79	79	//$jNotifyJSUrl = dol_buildpath('/includes/jquery/plugins/jnotify/jquery.jnotify.min.js', 2);
80		- $jNotifyJSUrl = $context->cdnUrl . '/jquery/plugins/jnotify/jquery.jnotify.min.js';
	80	+ $jNotifyJSUrl = $context->cdnUrl.'/jquery/plugins/jnotify/jquery.jnotify.min.js';
81	81	print '<script nonce="'.getNonce().'" src="'.$jNotifyJSUrl.'"></script>'."\n";
82	82
83	83	// SELECT 2
84		- print '<link rel="stylesheet" href="'.$context->cdnUrl . '/jquery/plugins/select2/dist/css/select2.css">'."\n";
85		- print '<script nonce="'.getNonce().'" src="'.$context->cdnUrl . '/jquery/plugins/select2/dist/js/select2.full.min.js"></script>'."\n";
	84	+ print '<link rel="stylesheet" href="'.$context->cdnUrl.'/jquery/plugins/select2/dist/css/select2.css">'."\n";
	85	+ print '<script nonce="'.getNonce().'" src="'.$context->cdnUrl.'/jquery/plugins/select2/dist/js/select2.full.min.js"></script>'."\n";
86	86
87	87	// Modal script
88	88	$ModalJSUrl = $context->rootUrl.'js/modal.js';
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	print '<script nonce="'.getNonce().'" src="'.$jQueryUIJSUrl.'"></script>'."\n";
94	94
95	95	$bodyAttributes = [
96		- 'data-theme' => $vars['body-theme']??'custom',
	96	+ 'data-theme' => $vars['body-theme'] ?? 'custom',
97	97	'data-controller' => $context->controller,
98	98	];
99	99

		@@ -119,110 +119,110 @@ discard block
		block discarded – undo
119	119	}
120	120	}
121	121
122		- if ($max_existing_level+1 < $depth) {
123		- $depth = $max_existing_level+1;
	122	+ if ($max_existing_level + 1 < $depth) {
	123	+ $depth = $max_existing_level + 1;
124	124	$this->errors[] = $langs->trans("TitleAddedLevelTooHigh", $depth);
125	125
126		- $error ++;
	126	+ $error++;
127	127	}
128	128	}
129	129
130	130	// Add the line calling the right module
131	131	if ($current_module == 'facture' && $this instanceof Facture) {
132	132	$result = $this->addline(
133		- $desc, // Description
134		- 0, // Unit price
135		- $depth, // Quantity
136		- 0, // VAT rate
137		- 0, // Local tax 1
138		- 0, // Local tax 2
139		- 0, // FK product
140		- 0, // Discount percentage
141		- '', // Date start
142		- '', // Date end
143		- 0, // FK code ventilation
144		- 0, // Info bits
145		- 0, // FK remise except
146		- '', // Price base type
147		- 0, // PU ttc
148		- self::$PRODUCT_TYPE, // Type
149		- $rang, // Rang
	133	+ $desc, // Description
	134	+ 0, // Unit price
	135	+ $depth, // Quantity
	136	+ 0, // VAT rate
	137	+ 0, // Local tax 1
	138	+ 0, // Local tax 2
	139	+ 0, // FK product
	140	+ 0, // Discount percentage
	141	+ '', // Date start
	142	+ '', // Date end
	143	+ 0, // FK code ventilation
	144	+ 0, // Info bits
	145	+ 0, // FK remise except
	146	+ '', // Price base type
	147	+ 0, // PU ttc
	148	+ self::$PRODUCT_TYPE, // Type
	149	+ $rang, // Rang
150	150	SUBTOTALS_SPECIAL_CODE // Special code
151	151	);
152	152	} elseif ($current_module == 'propal' && $this instanceof Propal) {
153	153	$result = $this->addline(
154		- $desc, // Description
155		- 0, // Unit price
156		- $depth, // Quantity
157		- 0, // VAT rate
158		- 0, // Local tax 1
159		- 0, // Local tax 2
160		- 0, // FK product
161		- 0, // Discount percentage
162		- '', // Price base type
163		- 0, // PU ttc
164		- 0, // Info bits
165		- self::$PRODUCT_TYPE, // Type
166		- $rang, // Rang
	154	+ $desc, // Description
	155	+ 0, // Unit price
	156	+ $depth, // Quantity
	157	+ 0, // VAT rate
	158	+ 0, // Local tax 1
	159	+ 0, // Local tax 2
	160	+ 0, // FK product
	161	+ 0, // Discount percentage
	162	+ '', // Price base type
	163	+ 0, // PU ttc
	164	+ 0, // Info bits
	165	+ self::$PRODUCT_TYPE, // Type
	166	+ $rang, // Rang
167	167	SUBTOTALS_SPECIAL_CODE // Special code
168	168	);
169	169	} elseif ($current_module == 'commande' && $this instanceof Commande) {
170	170	$result = $this->addline(
171		- $desc, // Description
172		- 0, // Unit price
173		- $depth, // Quantity
174		- 0, // VAT rate
175		- 0, // Local tax 1
176		- 0, // Local tax 2
177		- 0, // FK product
178		- 0, // Discount percentage
179		- 0, // Info bits
180		- 0, // FK remise except
181		- '', // Price base type
182		- 0, // PU ttc
183		- '', // Date start
184		- '', // Date end
185		- self::$PRODUCT_TYPE, // Type
186		- $rang, // Rang
	171	+ $desc, // Description
	172	+ 0, // Unit price
	173	+ $depth, // Quantity
	174	+ 0, // VAT rate
	175	+ 0, // Local tax 1
	176	+ 0, // Local tax 2
	177	+ 0, // FK product
	178	+ 0, // Discount percentage
	179	+ 0, // Info bits
	180	+ 0, // FK remise except
	181	+ '', // Price base type
	182	+ 0, // PU ttc
	183	+ '', // Date start
	184	+ '', // Date end
	185	+ self::$PRODUCT_TYPE, // Type
	186	+ $rang, // Rang
187	187	SUBTOTALS_SPECIAL_CODE // Special code
188	188	);
189	189	} elseif ($current_module == 'shipping' && $this instanceof Expedition) {
190	190	$result = $this->addline(
191		- 0, // Warehouse ID
192		- (int) $parent_line, // Source line
	191	+ 0, // Warehouse ID
	192	+ (int) $parent_line, // Source line
193	193	$depth // Quantity
194	194	);
195	195	} elseif ($current_module == 'facturerec' && $this instanceof FactureRec) {
196		- $rang = $rang == -1 ? $rang : $rang-1;
	196	+ $rang = $rang == -1 ? $rang : $rang - 1;
197	197	$result = $this->addline(
198		- $desc, // Description
199		- 0, // Unit price
200		- $depth, // Quantity
201		- 0, // VAT rate
202		- 0, // Local tax 1
203		- 0, // Local tax 2
204		- 0, // FK product
205		- 0, // Discount percentage
206		- '', // Price base type
207		- 0, // Info bits
208		- 0, // FK remise except
209		- 0, // PU ttc
210		- self::$PRODUCT_TYPE, // Type
211		- $rang, // Rang
	198	+ $desc, // Description
	199	+ 0, // Unit price
	200	+ $depth, // Quantity
	201	+ 0, // VAT rate
	202	+ 0, // Local tax 1
	203	+ 0, // Local tax 2
	204	+ 0, // FK product
	205	+ 0, // Discount percentage
	206	+ '', // Price base type
	207	+ 0, // Info bits
	208	+ 0, // FK remise except
	209	+ 0, // PU ttc
	210	+ self::$PRODUCT_TYPE, // Type
	211	+ $rang, // Rang
212	212	SUBTOTALS_SPECIAL_CODE // Special code
213	213	);
214	214	$this->fetch_lines();
215	215	} elseif ($current_module == 'fichinter' && $this instanceof Fichinter) {
216	216	global $user;
217	217	$result = $this->addline(
218		- $user, // user
219		- $this->id, // fk_fichinter
220		- $desc, // Description
221		- 0, // dateintervention
222		- $depth, // duration
223		- [], // arrayoption
224		- self::$PRODUCT_TYPE, // Type
225		- $rang, // Rang
	218	+ $user, // user
	219	+ $this->id, // fk_fichinter
	220	+ $desc, // Description
	221	+ 0, // dateintervention
	222	+ $depth, // duration
	223	+ [], // arrayoption
	224	+ self::$PRODUCT_TYPE, // Type
	225	+ $rang, // Rang
226	226	SUBTOTALS_SPECIAL_CODE // Special code
227	227	);
228	228	}
		@@ -272,7 +272,7 @@ discard block
		block discarded – undo
272	272
273	273	if ($correspondingstline) {
274	274	$oldDesc = "";
275		- $oldDepth = 0;
	275	+ $oldDepth = 0;
276	276	foreach ($this->lines as $line) {
277	277	if ($line->id == $id) {
278	278	$oldDesc = $line->desc;
		@@ -337,7 +337,7 @@ discard block
		block discarded – undo
337	337
338	338	$max_existing_level = 0;
339	339
340		- if ($depth>0) {
	340	+ if ($depth > 0) {
341	341	foreach ($this->lines as $line) {
342	342	if ($line->special_code == SUBTOTALS_SPECIAL_CODE && $line->qty > $max_existing_level && $line->id != $lineid) {
343	343	$max_existing_level = $line->qty;
		@@ -345,15 +345,15 @@ discard block
		block discarded – undo
345	345	}
346	346	}
347	347
348		- if ($max_existing_level+1 < $depth) {
349		- $depth = $max_existing_level+1;
	348	+ if ($max_existing_level + 1 < $depth) {
	349	+ $depth = $max_existing_level + 1;
350	350	$this->errors[] = $langs->trans("TitleEditedLevelTooHigh");
351		- $error ++;
	351	+ $error++;
352	352	}
353	353
354		- if ($depth>0) {
	354	+ if ($depth > 0) {
355	355	$oldDesc = "";
356		- $oldDepth = 0;
	356	+ $oldDepth = 0;
357	357	foreach ($this->lines as $line) {
358	358	if ($line->id == $lineid) {
359	359	$oldDesc = $line->desc;
		@@ -369,66 +369,66 @@ discard block
		block discarded – undo
369	369	// Update the line calling the right module
370	370	if ($current_module == 'facture' && $this instanceof Facture) {
371	371	$result = $this->updateline(
372		- $lineid, // ID of line to change
373		- $desc, // Description
374		- 0, // Unit price
375		- $depth, // Quantity
376		- 0, // Discount percentage
377		- '', // Date start
378		- '', // Date end
379		- 0, // VAT rate
380		- 0, // Local tax 1
381		- 0, // Local tax 2
382		- '', // Price base type
383		- 0, // Info bits
384		- self::$PRODUCT_TYPE, // Type
385		- 0, // FK parent line
386		- 0, // Skip update total
387		- 0, // FK fournprice
388		- 0, // PA ht
389		- '', // Label
	372	+ $lineid, // ID of line to change
	373	+ $desc, // Description
	374	+ 0, // Unit price
	375	+ $depth, // Quantity
	376	+ 0, // Discount percentage
	377	+ '', // Date start
	378	+ '', // Date end
	379	+ 0, // VAT rate
	380	+ 0, // Local tax 1
	381	+ 0, // Local tax 2
	382	+ '', // Price base type
	383	+ 0, // Info bits
	384	+ self::$PRODUCT_TYPE, // Type
	385	+ 0, // FK parent line
	386	+ 0, // Skip update total
	387	+ 0, // FK fournprice
	388	+ 0, // PA ht
	389	+ '', // Label
390	390	SUBTOTALS_SPECIAL_CODE // Special code
391	391	);
392	392	} elseif ($current_module == 'propal' && $this instanceof Propal) {
393	393	$result = $this->updateline(
394		- $lineid, // ID of line to change
395		- 0, // Unit price
396		- $depth, // Quantity
397		- 0, // Discount percentage
398		- 0, // VAT rate
399		- 0, // Local tax 1
400		- 0, // Local tax 2
401		- $desc, // Description
402		- '', // Price base type
403		- 0, // Info bits
	394	+ $lineid, // ID of line to change
	395	+ 0, // Unit price
	396	+ $depth, // Quantity
	397	+ 0, // Discount percentage
	398	+ 0, // VAT rate
	399	+ 0, // Local tax 1
	400	+ 0, // Local tax 2
	401	+ $desc, // Description
	402	+ '', // Price base type
	403	+ 0, // Info bits
404	404	SUBTOTALS_SPECIAL_CODE, // Special code
405		- 0, // FK parent line
406		- 0, // Skip update total
407		- 0, // FK fournprice
408		- 0, // PA ht
409		- '', // Label
	405	+ 0, // FK parent line
	406	+ 0, // Skip update total
	407	+ 0, // FK fournprice
	408	+ 0, // PA ht
	409	+ '', // Label
410	410	self::$PRODUCT_TYPE // Type
411	411	);
412	412	} elseif ($current_module == 'commande' && $this instanceof Commande) {
413	413	$result = $this->updateline(
414		- $lineid, // ID of line to change
415		- $desc, // Description
416		- 0, // Unit price
417		- $depth, // Quantity
418		- 0, // Discount percentage
419		- 0, // VAT rate
420		- 0, // Local tax 1
421		- 0, // Local tax 2
422		- '', // Price base type
423		- 0, // Info bits
424		- '', // Date start
425		- '', // Date end
426		- self::$PRODUCT_TYPE, // Type
427		- 0, // FK parent line
428		- 0, // Skip update total
429		- 0, // FK fournprice
430		- 0, // PA ht
431		- '', // Label
	414	+ $lineid, // ID of line to change
	415	+ $desc, // Description
	416	+ 0, // Unit price
	417	+ $depth, // Quantity
	418	+ 0, // Discount percentage
	419	+ 0, // VAT rate
	420	+ 0, // Local tax 1
	421	+ 0, // Local tax 2
	422	+ '', // Price base type
	423	+ 0, // Info bits
	424	+ '', // Date start
	425	+ '', // Date end
	426	+ self::$PRODUCT_TYPE, // Type
	427	+ 0, // FK parent line
	428	+ 0, // Skip update total
	429	+ 0, // FK fournprice
	430	+ 0, // PA ht
	431	+ '', // Label
432	432	SUBTOTALS_SPECIAL_CODE // Special code
433	433	);
434	434	} elseif ($current_module == 'facturerec' && $this instanceof FactureRec) {
		@@ -436,21 +436,21 @@ discard block
		block discarded – undo
436	436	$objectline->fetch($lineid);
437	437	$line_rang = $objectline->rang;
438	438	$result = $this->updateline(
439		- $lineid, // ID of line to change
440		- $desc, // Description
441		- 0, // Unit price
442		- $depth, // Quantity
443		- 0, // VAT rate
444		- 0, // Local tax 1
445		- 0, // Local tax 2
446		- 0, // FK parent line
447		- 0, // Discount percentage
448		- '', // Price base type
449		- 0, // Info bits
450		- 0, // FK parent line
451		- 0, // PU ttc
452		- self::$PRODUCT_TYPE, // Type
453		- $line_rang, // Rang
	439	+ $lineid, // ID of line to change
	440	+ $desc, // Description
	441	+ 0, // Unit price
	442	+ $depth, // Quantity
	443	+ 0, // VAT rate
	444	+ 0, // Local tax 1
	445	+ 0, // Local tax 2
	446	+ 0, // FK parent line
	447	+ 0, // Discount percentage
	448	+ '', // Price base type
	449	+ 0, // Info bits
	450	+ 0, // FK parent line
	451	+ 0, // PU ttc
	452	+ self::$PRODUCT_TYPE, // Type
	453	+ $line_rang, // Rang
454	454	SUBTOTALS_SPECIAL_CODE // Special code
455	455	);
456	456	}
		@@ -495,9 +495,9 @@ discard block
		block discarded – undo
495	495	$result = 0;
496	496	$linerang -= 1;
497	497
498		- $nb_lines = count($this->lines)+1;
	498	+ $nb_lines = count($this->lines) + 1;
499	499
500		- for ($i = $linerang+1; $i < $nb_lines; $i++) {
	500	+ for ($i = $linerang + 1; $i < $nb_lines; $i++) {
501	501	if ($this->lines[$i]->special_code == SUBTOTALS_SPECIAL_CODE) {
502	502	if (abs($this->lines[$i]->qty) <= (int) $this->lines[$linerang]->qty) {
503	503	return 1;
		@@ -597,16 +597,16 @@ discard block
		block discarded – undo
597	597	public function getSubtotalLineAmount($line)
598	598	{
599	599	$final_amount = 0;
600		- for ($i = $line->rang-1; $i > 0; $i--) {
601		- if (is_null($this->lines[$i-1]) \|\| $this->lines[$i-1]->rang >= $line->rang) {
	600	+ for ($i = $line->rang - 1; $i > 0; $i--) {
	601	+ if (is_null($this->lines[$i - 1]) \|\| $this->lines[$i - 1]->rang >= $line->rang) {
602	602	continue;
603	603	}
604		- if ($this->lines[$i-1]->special_code == SUBTOTALS_SPECIAL_CODE && $this->lines[$i-1]->qty > 0) {
605		- if ($this->lines[$i-1]->qty <= abs($line->qty)) {
	604	+ if ($this->lines[$i - 1]->special_code == SUBTOTALS_SPECIAL_CODE && $this->lines[$i - 1]->qty > 0) {
	605	+ if ($this->lines[$i - 1]->qty <= abs($line->qty)) {
606	606	return price($final_amount);
607	607	}
608	608	} else {
609		- $final_amount += $this->lines[$i-1]->total_ht;
	609	+ $final_amount += $this->lines[$i - 1]->total_ht;
610	610	}
611	611	}
612	612	return price($final_amount);
		@@ -624,16 +624,16 @@ discard block
		block discarded – undo
624	624	public function getSubtotalLineMulticurrencyAmount($line)
625	625	{
626	626	$final_amount = 0;
627		- for ($i = $line->rang-1; $i > 0; $i--) {
628		- if (is_null($this->lines[$i-1]) \|\| $this->lines[$i-1]->rang >= $line->rang) {
	627	+ for ($i = $line->rang - 1; $i > 0; $i--) {
	628	+ if (is_null($this->lines[$i - 1]) \|\| $this->lines[$i - 1]->rang >= $line->rang) {
629	629	continue;
630	630	}
631		- if ($this->lines[$i-1]->special_code == SUBTOTALS_SPECIAL_CODE && $this->lines[$i-1]->qty>0) {
632		- if ($this->lines[$i-1]->qty <= abs($line->qty)) {
	631	+ if ($this->lines[$i - 1]->special_code == SUBTOTALS_SPECIAL_CODE && $this->lines[$i - 1]->qty > 0) {
	632	+ if ($this->lines[$i - 1]->qty <= abs($line->qty)) {
633	633	return price($final_amount);
634	634	}
635	635	} else {
636		- $final_amount += $this->lines[$i-1]->multicurrency_total_ht;
	636	+ $final_amount += $this->lines[$i - 1]->multicurrency_total_ht;
637	637	}
638	638	}
639	639	return price($final_amount);
		@@ -701,7 +701,7 @@ discard block
		block discarded – undo
701	701	$toDisableLines = array();
702	702	$toDisable = true;
703	703	$oldDesc = "";
704		- $oldDepth = 0;
	704	+ $oldDepth = 0;
705	705
706	706	foreach ($this->lines as $titleLine) {
707	707	if ($titleLine->special_code != SUBTOTALS_SPECIAL_CODE \|\| $titleLine->qty <= 0) {
		@@ -720,7 +720,7 @@ discard block
		block discarded – undo
720	720	$toDisableLines = array_merge($toDisableLines, array($titleLine->id, $line->id));
721	721	}
722	722	$oldDesc = "";
723		- $oldDepth = 0;
	723	+ $oldDepth = 0;
724	724	$toDisable = true;
725	725	break;
726	726	}

Dolibarr / dolibarr

Branch — develop (6b00f4)

Status

Category

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +161 added lines, -161 removed lines patch added patch discarded remove patch

Spacing +112 added lines, -112 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch