Dolibarr / dolibarr

htdocs/imports/import.php

Spacing +8 added lines, -8 removed lines

@@ -143,7 +143,7 @@ 
 $endatlinenb		= (GETPOST('endatlinenb') ? GETPOST('endatlinenb') : '');
 $updatekeys			= (GETPOST('updatekeys', 'array') ? GETPOST('updatekeys', 'array') : array());
 $separator			= (GETPOST('separator', 'nohtml') ? GETPOST('separator', 'nohtml', 3) : '');
-$enclosure			= (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml') : '"');	// We must use 'nohtml' and not 'alphanohtml' because we must accept "
+$enclosure			= (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml') : '"'); // We must use 'nohtml' and not 'alphanohtml' because we must accept "
 $charset            = GETPOST('charset', 'aZ09');
 $separator_used     = str_replace('\t', "\t", $separator);
 
@@ -613,7 +613,7 @@ 
 	$maxfilesizearray = getMaxFileSizeArray();
 	$maxmin = $maxfilesizearray['maxmin'];
 	if ($maxmin > 0) {
-		print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 	}
 	print '<input type="file" name="userfile" size="20" maxlength="80"> &nbsp; &nbsp; ';
 	$out = (!getDolGlobalString('MAIN_UPLOAD_DOC') ? ' disabled' : '');
@@ -732,7 +732,7 @@ 
 	//var_dump($_SESSION["dol_array_match_file_to_database_select"]);
 	$serialized_array_match_file_to_database = isset($_SESSION["dol_array_match_file_to_database_select"]) ? $_SESSION["dol_array_match_file_to_database_select"] : '';
 	$fieldsarray = explode(',', $serialized_array_match_file_to_database);
-	$array_match_file_to_database = array();		// Same than $fieldsarray but with mapped value only  (col1 => 's.fielda', col2 => 's.fieldb'...)
+	$array_match_file_to_database = array(); // Same than $fieldsarray but with mapped value only  (col1 => 's.fielda', col2 => 's.fieldb'...)
 	foreach ($fieldsarray as $elem) {
 		$tabelem = explode('=', $elem, 2);
 		$key = $tabelem[0];
@@ -1086,7 +1086,7 @@ 
 
 	$optionsall = array();
 	foreach ($fieldstarget as $code => $line) {
-		$tmparray = explode('|', $line["label"]);	// If label of field is several translation keys separated with |
+		$tmparray = explode('|', $line["label"]); // If label of field is several translation keys separated with |
 		$labeltoshow = '';
 		foreach ($tmparray as $tmpkey => $tmpval) {
 			$labeltoshow .= ($labeltoshow ? ' '.$langs->trans('or').' ' : '').$langs->transnoentities($tmpval);
@@ -1120,7 +1120,7 @@ 
 	//var_dump($fieldssource);
 	//var_dump($fieldstarget);
 
-	$modetoautofillmapping = 'session';		// Use setup in session
+	$modetoautofillmapping = 'session'; // Use setup in session
 	if ($initialloadofstep4) {
 		$modetoautofillmapping = 'guess';
 	}
@@ -1326,7 +1326,7 @@ 
 		// - Then we set to disabled all fields that are selected
 		print 'function setOptionsToDisabled() {'."\n";
 		print '		console.log("Remove the disabled flag everywhere");'."\n";
-		print '		$("select.targetselectchange").not($( this )).find(\'option\').prop("disabled", false);'."\n";	// Enable all options
+		print '		$("select.targetselectchange").not($( this )).find(\'option\').prop("disabled", false);'."\n"; // Enable all options
 		print '		arrayofselectedvalues = [];'."\n";
 
 		print '		$("select.targetselectchange").each(function(){'."\n";
@@ -1340,10 +1340,10 @@ 
 		print '		console.log(arrayofselectedvalues);'."\n";
 		print '     console.log("Set the option to disabled for every entry that is currently selected somewhere else (so into arrayofselectedvalues)");'."\n";
 
-		print '     $.each(arrayofselectedvalues, function(key, value) {'."\n";	// Loop on each selected value
+		print '     $.each(arrayofselectedvalues, function(key, value) {'."\n"; // Loop on each selected value
 		print '         if (value != -1) {'."\n";
 		print '     		console.log("Process key="+key+" value="+value+" to disable.");'."\n";
-		print '				$("select.targetselectchange").find(\'option[value="\'+value+\'"]:not(:selected)\').prop("disabled", true);'."\n";	// Set to disabled except if currently selected
+		print '				$("select.targetselectchange").find(\'option[value="\'+value+\'"]:not(:selected)\').prop("disabled", true);'."\n"; // Set to disabled except if currently selected
 		print '         }'."\n";
 		print '     });'."\n";
 		print '}'."\n";

htdocs/includes/OAuth/OAuth2/Service/Generic.php

Indentation +154 added lines, -154 removed lines

@@ -24,159 +24,159 @@
 	const SCOPE_ADMIN_WRITE = 'admin:write';
 
 
-    public function __construct(
-        CredentialsInterface $credentials,
-        ClientInterface $httpClient,
-        TokenStorageInterface $storage,
-        $scopes = array(),
-        UriInterface $baseApiUri = null
-    ) {
-        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
-        if ($baseApiUri === null) {
-        	$url = getDolGlobalString('OAUTH_GENERIC-'.$storage->getKeyForProvider().'_URL');
-        	//$url = 'https://aaaaa.com';
-        	if (!empty($url)) {
+	public function __construct(
+		CredentialsInterface $credentials,
+		ClientInterface $httpClient,
+		TokenStorageInterface $storage,
+		$scopes = array(),
+		UriInterface $baseApiUri = null
+	) {
+		parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+		if ($baseApiUri === null) {
+			$url = getDolGlobalString('OAUTH_GENERIC-'.$storage->getKeyForProvider().'_URL');
+			//$url = 'https://aaaaa.com';
+			if (!empty($url)) {
 				$this->baseApiUri = new Uri($url);
-        	}
-        }
-    }
-
-    /**
-     * Return the private property $this->baseApiUri
-     */
-    public function getBaseApiUri()
-    {
-    	return $this->baseApiUri;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRequestTokenEndpoint()
-    {
-    	return new Uri($this->baseApiUri.'/oauth/request');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAuthorizationEndpoint()
-    {
-    	return new Uri($this->baseApiUri.'/oauth/authorize');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAccessTokenEndpoint()
-    {
-    	return new Uri($this->baseApiUri.'/oauth/token');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAuthorizationUri(array $additionalParameters = array())
-    {
-        $parameters = array_merge(
-            $additionalParameters,
-            array(
-                'redirect_uri' => $this->credentials->getCallbackUrl(),
-            )
-        );
-
-        // Build the url
-        $url = clone $this->getAuthorizationEndpoint();
-        foreach ($parameters as $key => $val) {
-            $url->addToQuery($key, $val);
-        }
-
-        return $url;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function requestRequestToken()
-    {
-        $responseBody = $this->httpClient->retrieveResponse(
-            $this->getRequestTokenEndpoint(),
-            array(
-                'consumer_key' => $this->credentials->getConsumerId(),
-                'redirect_uri' => $this->credentials->getCallbackUrl(),
-            )
-        );
-
-        $code = $this->parseRequestTokenResponse($responseBody);
-
-        return $code;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function parseRequestTokenResponse($responseBody)
-    {
-    	$data = array();
-
-        parse_str($responseBody, $data);
-
-        if (null === $data || !is_array($data)) {
-            throw new TokenResponseException('Unable to parse response.');
-        } elseif (!isset($data['code'])) {
-            throw new TokenResponseException('Error in retrieving code.');
-        }
-        return $data['code'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function requestAccessToken($code, $state = null)
-    {
-        $bodyParams = array(
-        	'client_id'     => $this->credentials->getConsumerId(),
-        	'client_secret' => $this->credentials->getConsumerSecret(),
-        	'redirect_uri'  => $this->credentials->getCallbackUrl(),
-        	'grant_type'    => 'authorization_code',
-            'code'             => $code,
-        	'consumer_key'     => $this->credentials->getConsumerId(),
-        );
-
-        $responseBody = $this->httpClient->retrieveResponse(
-            $this->getAccessTokenEndpoint(),
-            $bodyParams,
-            $this->getExtraOAuthHeaders()
-        );
-        $token = $this->parseAccessTokenResponse($responseBody);
-        $this->storage->storeAccessToken($this->service(), $token);
-
-        return $token;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function parseAccessTokenResponse($responseBody)
-    {
-    	$data = json_decode($responseBody, true);
-
-        if ($data === null || !is_array($data)) {
-            throw new TokenResponseException('Unable to parse response.');
-        } elseif (isset($data['error'])) {
-        	throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . (isset($data['error_description']) ? ' - '.$data['error_description'] : '').'"');
-        }
-
-        $token = new StdOAuth2Token();
-        #$token->setRequestToken($data['access_token']);
-        $token->setAccessToken($data['access_token']);
-
-        $token->setEndOfLife(StdOAuth2Token::EOL_NEVER_EXPIRES);
-
-        unset($data['access_token']);
-
-        $token->setExtraParams($data);
-
-        return $token;
-    }
+			}
+		}
+	}
+
+	/**
+	 * Return the private property $this->baseApiUri
+	 */
+	public function getBaseApiUri()
+	{
+		return $this->baseApiUri;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getRequestTokenEndpoint()
+	{
+		return new Uri($this->baseApiUri.'/oauth/request');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAuthorizationEndpoint()
+	{
+		return new Uri($this->baseApiUri.'/oauth/authorize');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAccessTokenEndpoint()
+	{
+		return new Uri($this->baseApiUri.'/oauth/token');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAuthorizationUri(array $additionalParameters = array())
+	{
+		$parameters = array_merge(
+			$additionalParameters,
+			array(
+				'redirect_uri' => $this->credentials->getCallbackUrl(),
+			)
+		);
+
+		// Build the url
+		$url = clone $this->getAuthorizationEndpoint();
+		foreach ($parameters as $key => $val) {
+			$url->addToQuery($key, $val);
+		}
+
+		return $url;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function requestRequestToken()
+	{
+		$responseBody = $this->httpClient->retrieveResponse(
+			$this->getRequestTokenEndpoint(),
+			array(
+				'consumer_key' => $this->credentials->getConsumerId(),
+				'redirect_uri' => $this->credentials->getCallbackUrl(),
+			)
+		);
+
+		$code = $this->parseRequestTokenResponse($responseBody);
+
+		return $code;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function parseRequestTokenResponse($responseBody)
+	{
+		$data = array();
+
+		parse_str($responseBody, $data);
+
+		if (null === $data || !is_array($data)) {
+			throw new TokenResponseException('Unable to parse response.');
+		} elseif (!isset($data['code'])) {
+			throw new TokenResponseException('Error in retrieving code.');
+		}
+		return $data['code'];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function requestAccessToken($code, $state = null)
+	{
+		$bodyParams = array(
+			'client_id'     => $this->credentials->getConsumerId(),
+			'client_secret' => $this->credentials->getConsumerSecret(),
+			'redirect_uri'  => $this->credentials->getCallbackUrl(),
+			'grant_type'    => 'authorization_code',
+			'code'             => $code,
+			'consumer_key'     => $this->credentials->getConsumerId(),
+		);
+
+		$responseBody = $this->httpClient->retrieveResponse(
+			$this->getAccessTokenEndpoint(),
+			$bodyParams,
+			$this->getExtraOAuthHeaders()
+		);
+		$token = $this->parseAccessTokenResponse($responseBody);
+		$this->storage->storeAccessToken($this->service(), $token);
+
+		return $token;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function parseAccessTokenResponse($responseBody)
+	{
+		$data = json_decode($responseBody, true);
+
+		if ($data === null || !is_array($data)) {
+			throw new TokenResponseException('Unable to parse response.');
+		} elseif (isset($data['error'])) {
+			throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . (isset($data['error_description']) ? ' - '.$data['error_description'] : '').'"');
+		}
+
+		$token = new StdOAuth2Token();
+		#$token->setRequestToken($data['access_token']);
+		$token->setAccessToken($data['access_token']);
+
+		$token->setEndOfLife(StdOAuth2Token::EOL_NEVER_EXPIRES);
+
+		unset($data['access_token']);
+
+		$token->setExtraParams($data);
+
+		return $token;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
         if ($data === null || !is_array($data)) {
             throw new TokenResponseException('Unable to parse response.');
         } elseif (isset($data['error'])) {
-        	throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . (isset($data['error_description']) ? ' - '.$data['error_description'] : '').'"');
+        	throw new TokenResponseException('Error in retrieving token: "'.$data['error'].(isset($data['error_description']) ? ' - '.$data['error_description'] : '').'"');
         }
 
         $token = new StdOAuth2Token();

htdocs/product/class/product.class.php

Indentation -1 removed lines

@@ -6268,7 +6268,6 @@
 	 *  Move an uploaded file described into $file array into target directory $sdir.
 	 *
 	 * @param	string $sdir Target directory
-
 	 * @param	array{name:string,tmp_name:string}	$file	Array of file info of file to upload: array('name'=>..., 'tmp_name'=>...)
 	 * @return	int											Return integer <0 if KO, >0 if OK
 	 */

Spacing +60 added lines, -60 removed lines

@@ -87,7 +87,7 @@ 
 		'contratdet' => array('name' => 'Contract', 'parent' => 'contrat', 'parentkey' => 'fk_contrat'),
 		'facture_fourn_det' => array('name' => 'SupplierInvoice', 'parent' => 'facture_fourn', 'parentkey' => 'fk_facture_fourn'),
 		'commande_fournisseurdet' => array('name' => 'SupplierOrder', 'parent' => 'commande_fournisseur', 'parentkey' => 'fk_commande'),
-		'mrp_production' => array('name' => 'Mo', 'parent' => 'mrp_mo', 'parentkey' => 'fk_mo' ),
+		'mrp_production' => array('name' => 'Mo', 'parent' => 'mrp_mo', 'parentkey' => 'fk_mo'),
 		'bom_bom' => array('name' => 'BOM'),
 		'bom_bomline' => array('name' => 'BOMLine', 'parent' => 'bom_bom', 'parentkey' => 'fk_bom'),
 	);
@@ -155,7 +155,7 @@ 
 	/**
 	 * @var string
 	 */
-	public $price_formated;			// used by takepos/ajax/ajax.php
+	public $price_formated; // used by takepos/ajax/ajax.php
 
 	/**
 	 * Selling price with tax
@@ -167,7 +167,7 @@ 
 	/**
 	 * @var string
 	 */
-	public $price_ttc_formated;		// used by takepos/ajax/ajax.php
+	public $price_ttc_formated; // used by takepos/ajax/ajax.php
 
 	/**
 	 * Minimum price net
@@ -516,7 +516,7 @@ 
 	/**
 	 * @var int|string
 	 */
-	public $weight_units;	// scale -3, 0, 3, 6
+	public $weight_units; // scale -3, 0, 3, 6
 	/**
 	 * @var float|string
 	 */
@@ -524,7 +524,7 @@ 
 	/**
 	 * @var int|string
 	 */
-	public $length_units;	// scale -3, 0, 3, 6
+	public $length_units; // scale -3, 0, 3, 6
 	/**
 	 * @var float|string
 	 */
@@ -532,7 +532,7 @@ 
 	/**
 	 * @var int|string
 	 */
-	public $width_units;	// scale -3, 0, 3, 6
+	public $width_units; // scale -3, 0, 3, 6
 	/**
 	 * @var float|string|null
 	 */
@@ -540,7 +540,7 @@ 
 	/**
 	 * @var int|string|null
 	 */
-	public $height_units;	// scale -3, 0, 3, 6
+	public $height_units; // scale -3, 0, 3, 6
 	/**
 	 * @var float|string|null
 	 */
@@ -548,7 +548,7 @@ 
 	/**
 	 * @var int|string|null
 	 */
-	public $surface_units;	// scale -3, 0, 3, 6
+	public $surface_units; // scale -3, 0, 3, 6
 	/**
 	 * @var float|string|null
 	 */
@@ -556,7 +556,7 @@ 
 	/**
 	 * @var int|string|null
 	 */
-	public $volume_units;	// scale -3, 0, 3, 6
+	public $volume_units; // scale -3, 0, 3, 6
 
 	/**
 	 * @var float|string|null
@@ -565,7 +565,7 @@ 
 	/**
 	 * @var ?string
 	 */
-	public $net_measure_units;	// scale -3, 0, 3, 6
+	public $net_measure_units; // scale -3, 0, 3, 6
 
 	/**
 	 * @var string
@@ -818,7 +818,7 @@ 
 		'import_key'    => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'index' => 0, 'position' => 1000),
 		//'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>'0', 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
 		//'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>'0', 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
-		'mandatory_period' => array('type' => 'integer', 'label' => 'mandatoryperiod', 'enabled' => 1, 'visible' => 1,  'notnull' => 1, 'default' => '0', 'index' => 1,  'position' => 1000),
+		'mandatory_period' => array('type' => 'integer', 'label' => 'mandatoryperiod', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'default' => '0', 'index' => 1, 'position' => 1000),
 	);
 
 	/**
@@ -1122,9 +1122,9 @@ 
 
 							// update accountancy for this entity
 							if (!$error && getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-								$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " .((int) $this->id) . " AND entity = " . ((int) $conf->entity));
+								$this->db->query("DELETE FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
 
-								$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
+								$sql = "INSERT INTO ".$this->db->prefix()."product_perentity (";
 								$sql .= " fk_product";
 								$sql .= ", entity";
 								$sql .= ", accountancy_code_buy";
@@ -1135,13 +1135,13 @@ 
 								$sql .= ", accountancy_code_sell_export";
 								$sql .= ") VALUES (";
 								$sql .= $this->id;
-								$sql .= ", " . ((int) $conf->entity);
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
+								$sql .= ", ".((int) $conf->entity);
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy_intra)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy_export)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
 								$sql .= ")";
 								$result = $this->db->query($sql);
 								if (!$result) {
@@ -1522,12 +1522,12 @@ 
 			$sql .= ", note_public = ".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : 'null');
 			$sql .= ", duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."'";
 			if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-				$sql .= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy) . "'";
-				$sql .= ", accountancy_code_buy_intra = '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
-				$sql .= ", accountancy_code_buy_export = '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
-				$sql .= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell) . "'";
-				$sql .= ", accountancy_code_sell_intra= '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
-				$sql .= ", accountancy_code_sell_export= '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
+				$sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
+				$sql .= ", accountancy_code_buy_intra = '".$this->db->escape($this->accountancy_code_buy_intra)."'";
+				$sql .= ", accountancy_code_buy_export = '".$this->db->escape($this->accountancy_code_buy_export)."'";
+				$sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
+				$sql .= ", accountancy_code_sell_intra= '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+				$sql .= ", accountancy_code_sell_export= '".$this->db->escape($this->accountancy_code_sell_export)."'";
 			}
 			$sql .= ", desiredstock = ".((isset($this->desiredstock) && is_numeric($this->desiredstock)) ? (float) $this->desiredstock : "null");
 			$sql .= ", cost_price = ".($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
@@ -1558,9 +1558,9 @@ 
 
 				// update accountancy for this entity
 				if (!$error && getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-					$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " . ((int) $this->id) . " AND entity = " . ((int) $conf->entity));
+					$this->db->query("DELETE FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
 
-					$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
+					$sql = "INSERT INTO ".$this->db->prefix()."product_perentity (";
 					$sql .= " fk_product";
 					$sql .= ", entity";
 					$sql .= ", accountancy_code_buy";
@@ -1571,13 +1571,13 @@ 
 					$sql .= ", accountancy_code_sell_export";
 					$sql .= ") VALUES (";
 					$sql .= ((int) $this->id);
-					$sql .= ", " . ((int) $conf->entity);
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
+					$sql .= ", ".((int) $conf->entity);
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy_intra)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy_export)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
 					$sql .= ")";
 					$result = $this->db->query($sql);
 					if (!$result) {
@@ -1655,7 +1655,7 @@ 
 								$error++;
 							} else {
 								// to keep old entries with the new dir
-								require_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
+								require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 								$ecmfiles = new EcmFiles($this->db);
 								$ecmfiles->updateAfterRename("produit/".dol_sanitizeFileName($this->oldcopy->ref), "produit/".dol_sanitizeFileName($this->ref));
 							}
@@ -1953,7 +1953,7 @@ 
 				}
 			} elseif (isset($this->multilangs[$key])) {
 				if (empty($this->multilangs[$key]["label"])) {
-					$this->errors[] = $key . ' : ' . $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"));
+					$this->errors[] = $key.' : '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"));
 					return -1;
 				}
 
@@ -2148,7 +2148,7 @@ 
 	 */
 	private function getArrayForPriceCompare($level = 0)
 	{
-		$testExit = array('multiprices','multiprices_ttc','multiprices_base_type','multiprices_min','multiprices_min_ttc','multiprices_tva_tx','multiprices_recuperableonly');
+		$testExit = array('multiprices', 'multiprices_ttc', 'multiprices_base_type', 'multiprices_min', 'multiprices_min_ttc', 'multiprices_tva_tx', 'multiprices_recuperableonly');
 
 		foreach ($testExit as $field) {
 			if (!isset($this->$field)) {
@@ -2792,12 +2792,12 @@ 
 
 		//For MultiCompany
 		//PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
-		$separatedEntityPMP = false;	// Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
-		$separatedStock = false;		// Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
+		$separatedEntityPMP = false; // Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
+		$separatedStock = false; // Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
 		$visibleWarehousesEntities = $conf->entity;
 		if (getDolGlobalString('MULTICOMPANY_PRODUCT_SHARING_ENABLED')) {
 			if (getDolGlobalString('MULTICOMPANY_PMP_PER_ENTITY_ENABLED')) {
-				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
+				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
 				if ($this->db->num_rows($checkPMPPerEntity) > 0) {
 					$separatedEntityPMP = true;
 				}
@@ -2805,7 +2805,7 @@ 
 			global $mc;
 			$separatedStock = true;
 			if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) {
-				$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
+				$visibleWarehousesEntities .= ",".implode(",", $mc->sharings['stock']);
 			}
 		}
 		if ($separatedEntityPMP) {
@@ -2823,10 +2823,10 @@ 
 		}
 		$sql .= " FROM ".$this->db->prefix()."product as p";
 		if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') || $separatedEntityPMP) {
-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 		}
 		if ($separatedStock) {
-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_stock as sp ON sp.fk_product = p.rowid AND sp.fk_entrepot IN (SELECT rowid FROM ".$this->db->prefix()."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_stock as sp ON sp.fk_product = p.rowid AND sp.fk_entrepot IN (SELECT rowid FROM ".$this->db->prefix()."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
 		}
 
 		if ($id) {
@@ -2986,15 +2986,15 @@ 
 						$sql .= " WHERE entity IN (".getEntity('productprice').")";
 						$sql .= " AND price_level=".((int) $i);
 						$sql .= " AND fk_product = ".((int) $this->id);
-						$sql .= " ORDER BY date_price DESC, rowid DESC";	// Get the most recent line
-						$sql .= " LIMIT 1";									// Only the first one
+						$sql .= " ORDER BY date_price DESC, rowid DESC"; // Get the most recent line
+						$sql .= " LIMIT 1"; // Only the first one
 						$resql = $this->db->query($sql);
 						if ($resql) {
 							$result = $this->db->fetch_array($resql);
 
 							$this->multiprices[$i] = $result ? $result["price"] : null;
 							$this->multiprices_ttc[$i] = $result ? $result["price_ttc"] : null;
-							$this->multiprices_min[$i] =  $result ? $result["price_min"] : null;
+							$this->multiprices_min[$i] = $result ? $result["price_min"] : null;
 							$this->multiprices_min_ttc[$i] = $result ? $result["price_min_ttc"] : null;
 							$this->multiprices_base_type[$i] = $result ? $result["price_base_type"] : null;
 							// Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
@@ -3219,7 +3219,7 @@ 
 				$obj = $this->db->fetch_object($result);
 				$this->stats_mo['customers_'.$role] = $obj->nb_customers ? $obj->nb_customers : 0;
 				$this->stats_mo['nb_'.$role] = $obj->nb ? $obj->nb : 0;
-				$this->stats_mo['qty_'.$role] = $obj->qty ? price2num($obj->qty, 'MS') : 0;		// qty may be a float due to the SUM()
+				$this->stats_mo['qty_'.$role] = $obj->qty ? price2num($obj->qty, 'MS') : 0; // qty may be a float due to the SUM()
 			} else {
 				$this->error = $this->db->error();
 				$error++;
@@ -4722,7 +4722,7 @@ 
 				//Addition of a product with the highest rank +1
 				$sql = "INSERT INTO ".$this->db->prefix()."product_association(fk_product_pere,fk_product_fils,qty,incdec,rang)";
 				$sql .= " VALUES (".((int) $id_pere).", ".((int) $id_fils).", ".price2num($qty, 'MS').", ".((int) $incdec).", ".((int) $rank).")";
-				if (! $this->db->query($sql)) {
+				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 					return -1;
 				} else {
@@ -4843,7 +4843,7 @@ 
 				$sql = "UPDATE ".$this->db->prefix()."product_association";
 				$sql .= " SET rang = ".((int) $cpt);
 				$sql .= " WHERE rowid = ".((int) $objrank->rowid);
-				if (! $this->db->query($sql)) {
+				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 					return -1;
 				}
@@ -5278,7 +5278,7 @@ 
 		if (isset($this->sousprods) && is_array($this->sousprods)) {
 			foreach ($this->sousprods as $prod_name => $desc_product) {
 				if (is_array($desc_product)) {
-					$this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id, $ignore_stock_load);	// This set $this->res
+					$this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id, $ignore_stock_load); // This set $this->res
 				}
 			}
 		}
@@ -5434,7 +5434,7 @@ 
 		$sql .= " AND pa.fk_product_fils <> ".((int) $id); // This should not happens, it is to avoid infinite loop if it happens
 		$sql .= " ORDER BY pa.rang";
 
-		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level. ' parents='.(is_array($parents) ? implode(',', $parents) : $parents), LOG_DEBUG);
+		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level.' parents='.(is_array($parents) ? implode(',', $parents) : $parents), LOG_DEBUG);
 
 		if ($level == 1) {
 			$alreadyfound = array($id => 1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediately
@@ -5499,7 +5499,7 @@ 
 			$parent[$this->label][$keyChild] = $valueChild;
 		}
 		foreach ($parent as $key => $value) {        // key=label, value is array of children
-			$this->sousprods[$key] = $value;  // @phan-suppress-current-line PhanTypeMismatchProperty
+			$this->sousprods[$key] = $value; // @phan-suppress-current-line PhanTypeMismatchProperty
 		}
 	}
 
@@ -5526,7 +5526,7 @@ 
 		if (!empty($this->entity)) {
 			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80, 0, 0, 0, 0, 1);
 			if ($this->nbphoto > 0) {
-				$datas['photo'] = '<div class="photointooltip floatright">'."\n" . $tmpphoto . '</div>';
+				$datas['photo'] = '<div class="photointooltip floatright">'."\n".$tmpphoto.'</div>';
 			}
 		}
 
@@ -5536,7 +5536,7 @@ 
 			$datas['picto'] = img_picto('', 'service').' <u class="paddingrightonly">'.$langs->trans("Service").'</u>';
 		}
 		if (isset($this->status) && isset($this->status_buy)) {
-			$datas['status'] = ' '.$this->getLibStatut(5, 0) . ' '.$this->getLibStatut(5, 1);
+			$datas['status'] = ' '.$this->getLibStatut(5, 0).' '.$this->getLibStatut(5, 1);
 		}
 
 		if (!empty($this->ref)) {
@@ -5584,7 +5584,7 @@ 
 				$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuringUnitString(0, 'volume', $this->volume_units);
 			}
 			if ($labelsurfacevolume) {
-				$datas['surface'] = "<br>" . $labelsurfacevolume;
+				$datas['surface'] = "<br>".$labelsurfacevolume;
 			}
 		}
 		if ($this->isService() && !empty($this->duration_value)) {
@@ -5626,9 +5626,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (isModEnabled('category') && !$nofetch) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_PRODUCT, 1);
+			$datas['categories'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_PRODUCT, 1);
 		}
 
 		return $datas;
@@ -6150,7 +6150,7 @@ 
 		if (isModEnabled("supplier_order")) {
 			$filterStatus = getDolGlobalString('SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK', '3,4');
 			if (isset($includedraftpoforvirtual)) {
-				$filterStatus = '0,1,2,'.$filterStatus;	// 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them
+				$filterStatus = '0,1,2,'.$filterStatus; // 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them
 			}
 			$result = $this->load_stats_commande_fournisseur(0, $filterStatus, 1, $dateofvirtualstock);
 			if ($result < 0) {
@@ -6567,7 +6567,7 @@ 
 		if (getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM')) {
 			$dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
 			foreach ($dirsociete as $dirroot) {
-				$res = dol_include_once($dirroot . getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM').'.php');
+				$res = dol_include_once($dirroot.getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM').'.php');
 				if ($res) {
 					break;
 				}

htdocs/product/class/api_products.class.php

Spacing +7 added lines, -7 removed lines

@@ -190,7 +190,7 @@ 
 
 		$sql = "SELECT t.rowid, t.ref, t.ref_ext";
 		$sql .= " FROM ".$this->db->prefix()."product as t";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields AS ef ON ef.fk_object = t.rowid"; // So we will be able to filter on extrafields
 		if ($category > 0) {
 			$sql .= ", ".$this->db->prefix()."categorie_product as c";
 		}
@@ -230,7 +230,7 @@ 
 		}
 
 		//this query will return total products with the filters given
-		$sqlTotals =  str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
+		$sqlTotals = str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
@@ -290,7 +290,7 @@ 
 			$obj_ret['pagination'] = array(
 				'total' => (int) $total,
 				'page' => $page, //count starts from 0
-				'page_count' => ceil((int) $total/$limit),
+				'page_count' => ceil((int) $total / $limit),
 				'limit' => $limit
 			);
 		}
@@ -327,7 +327,7 @@ 
 
 		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			$key_max = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
-			for ($key = 1; $key <= $key_max ; $key++) {
+			for ($key = 1; $key <= $key_max; $key++) {
 				$newvat = $this->product->multiprices_tva_tx[$key];
 				$newnpr = 0;
 				$newvatsrccode = $this->product->default_vat_code;
@@ -460,7 +460,7 @@ 
 
 		if ($result > 0 && getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			$key_max = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
-			for ($key = 1; $key <= $key_max ; $key++) {
+			for ($key = 1; $key <= $key_max; $key++) {
 				$pricemodified = false;
 				if ($this->product->multiprices_base_type[$key] != $oldproduct->multiprices_base_type[$key]) {
 					$pricemodified = true;
@@ -2065,7 +2065,7 @@ 
 		unset($object->fk_bank);
 		unset($object->fk_account);
 
-		unset($object->supplierprices);	// Must use another API to get them
+		unset($object->supplierprices); // Must use another API to get them
 
 		if (!DolibarrApiAccess::$user->hasRight('stock', 'lire')) {
 			unset($object->stock_reel);
@@ -2158,7 +2158,7 @@ 
 				$children[] = array_combine($keys, $values);
 			}
 
-			$this->product->sousprods = $children;  // @phpstan-ignore-line
+			$this->product->sousprods = $children; // @phpstan-ignore-line
 		}
 
 		if ($includeparentid) {

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

Spacing +112 added lines, -112 removed lines

@@ -33,7 +33,7 @@ 
  *	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 @@ 
 		$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 @@ 
 		$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);
@@ -152,13 +152,13 @@ 
 		// 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);
@@ -184,9 +184,9 @@ 
 			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>';
 	}
 
@@ -203,13 +203,13 @@ 
 	{
 		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);
@@ -235,9 +235,9 @@ 
 			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>';
 	}
 
@@ -278,7 +278,7 @@ 
 		// 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");
 
@@ -286,28 +286,28 @@ 
 
 		// 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) {
@@ -318,15 +318,15 @@ 
 						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
@@ -335,13 +335,13 @@ 
 							(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 : ''));
 							}
@@ -356,7 +356,7 @@ 
 				$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);
@@ -364,7 +364,7 @@ 
 
 		// 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);
 		}
 
@@ -417,14 +417,14 @@ 
 		$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) {
@@ -436,16 +436,16 @@ 
 					} 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++;
@@ -476,13 +476,13 @@ 
 
 		$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;
@@ -490,12 +490,12 @@ 
 				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++;
 				}
@@ -507,7 +507,7 @@ 
 
 			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 {
@@ -557,22 +557,22 @@ 
 
 		// 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($country_codeid) . "'";
+			$sql .= " AND c.code = '".$this->db->escape($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.
 			}
@@ -586,9 +586,9 @@ 
 					$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[$obj->code] = array('code' => $obj->code, 'label' => $labeljs, 'label_sort' => $labelcountry . '_' . $labeljs, 'country_code' => $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[$obj->code] = array('code' => $obj->code, 'label' => $labeljs, 'label_sort' => $labelcountry.'_'.$labeljs, 'country_code' => $obj->country_code, 'country' => $labelcountry);
 					}
 					$i++;
 				}
@@ -602,15 +602,15 @@ 
 					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'];
@@ -619,11 +619,11 @@ 
 			}
 			$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>';
@@ -677,13 +677,13 @@ 
 			$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);
 							}
 						});
 
@@ -691,13 +691,13 @@ 
 					});
 
 					// 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,
@@ -727,9 +727,9 @@ 
 				</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(($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(($socid ? $socid : -1), $htmlname, DOL_URL_ROOT.'/societe/ajax/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
 		} else {
 			// Search to list thirdparties
@@ -741,14 +741,14 @@ 
 				$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";
 			}
-			$sql .= " WHERE s.entity IN (" . getEntity('societe') . ")";
+			$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 			// 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)).")";
 			}
 			// Add where from hooks
 			$parameters = array();
@@ -758,10 +758,10 @@ 
 
 			$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>';
@@ -779,18 +779,18 @@ 
 							$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++;
 					}
@@ -825,22 +825,22 @@ 
 
 		$out = '';
 		if (is_object($object) && method_exists($object, 'liste_type_contact')) {
-			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);	// List of types into c_type_contact for element=$object->element
+			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 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>';
 			}
 			foreach ($lesTypes as $key => $value) {
-				$out .= '<option value="' . $key . '"';
+				$out .= '<option value="'.$key.'"';
 				if ($key == $selected) {
 					$out .= ' selected';
 				}
-				$out .= '>' . $value . '</option>';
+				$out .= '>'.$value.'</option>';
 			}
 			$out .= "</select>";
 			if ($user->admin && empty($forcehidetooltip)) {
-				$out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
 
 			$out .= ajax_combobox($htmlname);
@@ -870,9 +870,9 @@ 
 		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
@@ -918,14 +918,14 @@ 
 
 		$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;
 	}
@@ -1001,7 +1001,7 @@ 
 		$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;
 
@@ -1032,9 +1032,9 @@ 
 				$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>';
@@ -1063,7 +1063,7 @@ 
 			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">';
@@ -1075,33 +1075,33 @@ 
 				$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>';
@@ -1127,12 +1127,12 @@ 
 
 		$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' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // 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) {
@@ -1171,7 +1171,7 @@ 
 
 			//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';
 			}
@@ -1201,8 +1201,8 @@ 
 						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);

htdocs/core/modules/oauth/generic_oauthcallback.php

Spacing +5 added lines, -5 removed lines

@@ -140,7 +140,7 @@ 
 // access type needed to have oauth provider refreshing token
 // also note that a refresh token is sent only after a prompt
 if (method_exists($apiService, 'setAccessType')) {
-	$apiService->setAccessType('offline');		// Most generic OAUTH provider does not provide AccessType online/offline. They are mostly offline.
+	$apiService->setAccessType('offline'); // Most generic OAUTH provider does not provide AccessType online/offline. They are mostly offline.
 }
 
 if (!getDolGlobalString($keyforparamid)) {
@@ -183,7 +183,7 @@ 
 
 	// Set approval_prompt. Note: A refresh token will be provided only if prompt is done.
 	if ($forlogin) {
-		$approval_prompt = getDolGlobalString('OAUTH_'.$genericstring.'_FORCE_PROMPT_ON_LOGIN', 'auto');	// Can be 'force'
+		$approval_prompt = getDolGlobalString('OAUTH_'.$genericstring.'_FORCE_PROMPT_ON_LOGIN', 'auto'); // Can be 'force'
 		if (method_exists($apiService, 'setApprouvalPrompt')) {
 			$apiService->setApprouvalPrompt($approval_prompt);
 		}
@@ -206,7 +206,7 @@ 
 	$url .= '&scope='.str_replace(',', '+', $statewithscopeonly);
 
 	// Add more param
-	$url .= '&nonce='.bin2hex(random_bytes(64/8));
+	$url .= '&nonce='.bin2hex(random_bytes(64 / 8));
 
 	if ($forlogin) {
 		// TODO Add param hd. What is it for ?
@@ -325,10 +325,10 @@ 
 					$entitytosearchuser = (isset($tmparray['entity']) ? $tmparray['entity'] : -1);
 
 					// Delete the old token
-					$storage->clearToken($genericstring);	// Delete the token called ("Generic-".$storage->keyforprovider)
+					$storage->clearToken($genericstring); // Delete the token called ("Generic-".$storage->keyforprovider)
 
 					$tmpuser = new User($db);
-					$res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1);	// Load user. Can load with email_oauth2.
+					$res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1); // Load user. Can load with email_oauth2.
 
 					if ($res > 0) {
 						$username = $tmpuser->login;

htdocs/projet/class/project.class.php

Spacing +5 added lines, -5 removed lines

@@ -1741,7 +1741,7 @@ 
 		global $langs, $conf;
 
 		$error = 0;
-		$clone_project_id = 0;   // For static toolcheck
+		$clone_project_id = 0; // For static toolcheck
 
 		dol_syslog("createFromClone clone_contact=".json_encode($clone_contact)." clone_task=".json_encode($clone_task)." clone_project_file=".json_encode($clone_project_file)." clone_note=".json_encode($clone_note)." move_date=".json_encode($move_date), LOG_DEBUG);
 
@@ -2035,7 +2035,7 @@ 
 		if ($tableName == "actioncomm") {
 			$sql .= " SET fk_project=".$this->id;
 			$sql .= " WHERE id=".((int) $elementSelectId);
-		} elseif (in_array($tableName, ["entrepot","mrp_mo","stocktransfer_stocktransfer"])) {
+		} elseif (in_array($tableName, ["entrepot", "mrp_mo", "stocktransfer_stocktransfer"])) {
 			$sql .= " SET fk_project=".$this->id;
 			$sql .= " WHERE rowid=".((int) $elementSelectId);
 		} else {
@@ -2226,7 +2226,7 @@ 
 					$date = explode('-', $obj->element_date);
 					$week_number = getWeekNumber((int) $date[2], (int) $date[1], (int) $date[0]);
 				}
-				'@phan-var-force int $week_number';  // Needed because phan considers it might be null
+				'@phan-var-force int $week_number'; // Needed because phan considers it might be null
 				if (empty($weekalreadyfound[$week_number])) {
 					$this->monthWorkLoad[$week_number] = $obj->element_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_element] = $obj->element_duration;
@@ -2570,7 +2570,7 @@ 
 			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Author").'</span>';
 			$return .= '<span> : '.$user->getNomUrl(1).'</span>';
 		}*/
-		$return .= '<br><div>';	// start div line status
+		$return .= '<br><div>'; // start div line status
 		if ($this->usage_opportunity && $this->opp_status_code) {
 			//$return .= '<br><span class="info-bo-label opacitymedium">'.$langs->trans("OpportunityStatusShort").'</span>';
 			//$return .= '<div class="small inline-block">'.dol_trunc($langs->trans("OppStatus".$this->opp_status_code), 5).'</div>';
@@ -2580,7 +2580,7 @@ 
 		if (method_exists($this, 'getLibStatut')) {
 			$return .= '<div class="info-box-status small inline-block valignmiddle">'.$this->getLibStatut(3).'</div>';
 		}
-		$return .= '</div>';	// end div line status
+		$return .= '</div>'; // end div line status
 
 		$return .= '</div>';
 		$return .= '</div>';

htdocs/societe/class/societe.class.php

Spacing +35 added lines, -35 removed lines

@@ -1042,8 +1042,8 @@ 
 			$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
 			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql .= ", ".(empty($this->vat_reverse_charge) ? '0' : '1');
-				$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-				$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
+				$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+				$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
 			}
 			$sql .= ")";
 
@@ -1092,7 +1092,7 @@ 
 				}
 
 				if ($ret >= 0) {
-					if (! $notrigger) {
+					if (!$notrigger) {
 						// Call trigger
 						$result = $this->call_trigger('COMPANY_CREATE', $user);
 						if ($result < 0) {
@@ -1169,7 +1169,7 @@ 
 		$contact->town              = $this->town;
 		$this->setUpperOrLowerCase();
 		$contact->phone_pro         = $this->phone;
-		$contact->roles				= explode(',', getDolGlobalString('CONTACTS_DEFAULT_ROLES'));
+		$contact->roles = explode(',', getDolGlobalString('CONTACTS_DEFAULT_ROLES'));
 
 		$contactId = $contact->create($user, $notrigger);
 		if ($contactId < 0) {
@@ -1336,7 +1336,7 @@ 
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->loadLangs(array("errors", 'compta'));
 							$error++;
-							$this->errors[] = $langs->trans('CustomerAccountancyCodeShort') . " " . $langs->trans("ErrorProdIdAlreadyExist", $vallabel) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+							$this->errors[] = $langs->trans('CustomerAccountancyCodeShort')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
 					}
 
@@ -1344,7 +1344,7 @@ 
 					if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_MANDATORY') && (!isset($vallabel) || trim($vallabel) === '')) {
 						$langs->loadLangs(array("errors", 'compta'));
 						$error++;
-						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('CustomerAccountancyCodeShort')) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('CustomerAccountancyCodeShort')).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 				} elseif ($key == 'ACCOUNTANCY_CODE_SUPPLIER' && !empty($this->fournisseur)) {
 					// Check for unicity
@@ -1352,7 +1352,7 @@ 
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->loadLangs(array("errors", 'compta'));
 							$error++;
-							$this->errors[] = $langs->trans('SupplierAccountancyCodeShort') . " " . $langs->trans("ErrorProdIdAlreadyExist", $vallabel) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+							$this->errors[] = $langs->trans('SupplierAccountancyCodeShort')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
 					}
 
@@ -1360,7 +1360,7 @@ 
 					if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_SUPPLIER_MANDATORY') && (!isset($vallabel) || trim($vallabel) === '')) {
 						$langs->loadLangs(array("errors", 'compta'));
 						$error++;
-						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('SupplierAccountancyCodeShort')) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('SupplierAccountancyCodeShort')).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 				}
 			}
@@ -1402,17 +1402,17 @@ 
 		$now = dol_now();
 
 		// Clean parameters
-		$this->id 			= $id;
-		$this->entity 		= ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
+		$this->id = $id;
+		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 		$this->name 		= $this->name ? trim($this->name) : trim((string) $this->nom);
 		$this->nom 			= $this->name; // For backward compatibility
-		$this->name_alias 	= trim((string) $this->name_alias);
+		$this->name_alias = trim((string) $this->name_alias);
 		$this->ref_ext		= (empty($this->ref_ext) ? '' : trim($this->ref_ext));
 		$this->address		= trim((string) $this->address);
 		$this->zip 			= trim((string) $this->zip);
 		$this->town 		= trim((string) $this->town);
-		$this->state_id 	= (is_numeric($this->state_id)) ? (int) trim((string) $this->state_id) : 0;
-		$this->country_id 	= ($this->country_id > 0) ? $this->country_id : 0;
+		$this->state_id = (is_numeric($this->state_id)) ? (int) trim((string) $this->state_id) : 0;
+		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim((string) $this->phone);
 		$this->phone		= preg_replace("/\s/", "", $this->phone);
 		$this->phone		= preg_replace("/\./", "", $this->phone);
@@ -1422,7 +1422,7 @@ 
 		$this->fax			= trim((string) $this->fax);
 		$this->fax			= preg_replace("/\s/", "", $this->fax);
 		$this->fax			= preg_replace("/\./", "", $this->fax);
-		$this->email		= trim((string) $this->email);
+		$this->email = trim((string) $this->email);
 		$this->url			= $this->url ? clean_url($this->url, 0) : '';
 		$this->note_private = (empty($this->note_private) ? '' : trim($this->note_private));
 		$this->note_public  = (empty($this->note_public) ? '' : trim($this->note_public));
@@ -1432,14 +1432,14 @@ 
 		$this->idprof4		= trim((string) $this->idprof4);
 		$this->idprof5		= (!empty($this->idprof5) ? trim($this->idprof5) : '');
 		$this->idprof6		= (!empty($this->idprof6) ? trim($this->idprof6) : '');
-		$this->prefix_comm 	= trim((string) $this->prefix_comm);
+		$this->prefix_comm = trim((string) $this->prefix_comm);
 		$this->outstanding_limit = price2num($this->outstanding_limit);
 		$this->order_min_amount = price2num($this->order_min_amount);
 		$this->supplier_order_min_amount = price2num($this->supplier_order_min_amount);
 
 		$this->tva_assuj			= (is_numeric($this->tva_assuj)) ? (int) trim((string) $this->tva_assuj) : 0;
 		$this->tva_intra			= dol_sanitizeFileName($this->tva_intra, '');
-		$this->vat_reverse_charge	= empty($this->vat_reverse_charge) ? 0 : 1;
+		$this->vat_reverse_charge = empty($this->vat_reverse_charge) ? 0 : 1;
 		if (empty($this->status)) {
 			$this->status = 0;
 		}
@@ -1590,7 +1590,7 @@ 
 			$sql .= ",tva_assuj = ".($this->tva_assuj != '' ? "'".$this->db->escape($this->tva_assuj)."'" : "null");
 			$sql .= ",tva_intra = '".$this->db->escape($this->tva_intra)."'";
 			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-				$sql .= ",vat_reverse_charge = " . ($this->vat_reverse_charge != '' ? "'" . $this->db->escape($this->vat_reverse_charge) . "'" : 0);
+				$sql .= ",vat_reverse_charge = ".($this->vat_reverse_charge != '' ? "'".$this->db->escape($this->vat_reverse_charge)."'" : 0);
 			}
 			$sql .= ",status = ".((int) $this->status);
 
@@ -1651,8 +1651,8 @@ 
 			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
 			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-				$sql .= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy) . "'";
-				$sql .= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell) . "'";
+				$sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
+				$sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
 				if ($customer) {
 					$sql .= ", code_compta = ".(!empty($this->code_compta_client) ? "'".$this->db->escape($this->code_compta_client)."'" : "null");
 				}
@@ -2022,7 +2022,7 @@ 
 				$this->code_client = $obj->code_client;
 				$this->code_fournisseur = $obj->code_fournisseur;
 
-				$this->code_compta = $obj->code_compta;			// For backward compatibility
+				$this->code_compta = $obj->code_compta; // For backward compatibility
 				$this->code_compta_client = $obj->code_compta;
 				$this->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
@@ -2039,7 +2039,7 @@ 
 					$this->vat_reverse_charge = 0;
 				}
 
-				$this->status				= $obj->status;
+				$this->status = $obj->status;
 
 				// Local Taxes
 				$this->localtax1_assuj      = $obj->localtax1_assuj;
@@ -2066,7 +2066,7 @@ 
 
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;
-				$this->deposit_percent		= $obj->deposit_percent;
+				$this->deposit_percent = $obj->deposit_percent;
 				$this->transport_mode_id 	= $obj->transport_mode;
 				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
 				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
@@ -2598,10 +2598,10 @@ 
 					$reparray[$i]['firstname'] = $obj->firstname;
 					$reparray[$i]['email'] = $obj->email;
 					$reparray[$i]['phone'] = $obj->office_phone;
-					$reparray[$i]['office_phone'] = $obj->office_phone;			// Pro phone
+					$reparray[$i]['office_phone'] = $obj->office_phone; // Pro phone
 					$reparray[$i]['office_fax'] = $obj->office_fax;
-					$reparray[$i]['user_mobile'] = $obj->user_mobile;			// Pro mobile
-					$reparray[$i]['personal_mobile'] = $obj->personal_mobile;	// Personal mobile
+					$reparray[$i]['user_mobile'] = $obj->user_mobile; // Pro mobile
+					$reparray[$i]['personal_mobile'] = $obj->personal_mobile; // Personal mobile
 					$reparray[$i]['job'] = $obj->job;
 					$reparray[$i]['statut'] = $obj->status; // deprecated
 					$reparray[$i]['status'] = $obj->status;
@@ -2814,7 +2814,7 @@ 
 			$datas['status'] = ' '.$this->getLibStatut(5);
 		}
 		if (isset($this->client) && isset($this->fournisseur)) {
-			$datas['type'] = ' &nbsp; ' . $this->getTypeUrl(1);
+			$datas['type'] = ' &nbsp; '.$this->getTypeUrl(1);
 		}
 		$datas['name'] = '<br><b>'.$langs->trans('Name').':</b> '.dol_escape_htmltag(dol_string_nohtmltag($this->name));
 		if (!empty($this->name_alias) && empty($noaliasinname)) {
@@ -2882,9 +2882,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (!$nofetch && isModEnabled('category') && $this->client) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories_customer'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_CUSTOMER, 1, 1);
+			$datas['categories_customer'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_CUSTOMER, 1, 1);
 		}
 		if (!empty($this->code_fournisseur) && $this->fournisseur) {
 			$datas['suppliercode'] = '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
@@ -2895,9 +2895,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (!$nofetch && isModEnabled('category') && $this->fournisseur) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories_supplier'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_SUPPLIER, 1, 1);
+			$datas['categories_supplier'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_SUPPLIER, 1, 1);
 		}
 
 		$datas['divclose'] = '</div>';
@@ -3711,7 +3711,7 @@ 
 		} else {
 			if ($type == 'customer') {
 				$this->code_compta_client = '';
-				$this->code_compta = '';	// For backward compatibility
+				$this->code_compta = ''; // For backward compatibility
 			} elseif ($type == 'supplier') {
 				$this->code_compta_fournisseur = '';
 			}
@@ -3803,7 +3803,7 @@ 
 		global $langs;
 
 		if ($company_id > 0) {
-			$sql = "SELECT parent FROM " . MAIN_DB_PREFIX . "societe WHERE rowid = ".((int) $company_id);
+			$sql = "SELECT parent FROM ".MAIN_DB_PREFIX."societe WHERE rowid = ".((int) $company_id);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				if ($obj = $this->db->fetch_object($resql)) {
@@ -4419,7 +4419,7 @@ 
 		$country_code = $country_label = '';
 		if (getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY')) {
 			$tmp = explode(':', getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY'));
-			$country_id =  (is_numeric($tmp[0])) ? (int) $tmp[0] : 0;
+			$country_id = (is_numeric($tmp[0])) ? (int) $tmp[0] : 0;
 			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 				$country_code = $tmp[1];
 				$country_label = $tmp[2];
@@ -5294,7 +5294,7 @@ 
 		if (method_exists($this, 'getLibStatut')) {
 			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
-		$return .= '</div>';	// end info-box-content
+		$return .= '</div>'; // end info-box-content
 		$return .= '</div>';
 		$return .= '</div>';
 
@@ -5398,7 +5398,7 @@ 
 		global $conf, $langs, $hookmanager, $user, $action;
 
 		$error = 0;
-		$soc_origin = new Societe($this->db);		// The thirdparty that we will delete
+		$soc_origin = new Societe($this->db); // The thirdparty that we will delete
 
 		dol_syslog("mergeCompany merge thirdparty id=".$soc_origin_id." (will be deleted) into the thirdparty id=".$this->id);
 

htdocs/compta/facture/class/facture.class.php

Spacing +41 added lines, -41 removed lines

@@ -503,7 +503,7 @@ 
 			$this->mode_reglement_id = 0;
 		}
 		$this->status = self::STATUS_DRAFT;
-		$this->statut = self::STATUS_DRAFT;	// deprecated
+		$this->statut = self::STATUS_DRAFT; // deprecated
 
 		if (!empty($this->multicurrency_code)) {
 			// Multicurrency (test on $this->multicurrency_tx because we should take the default rate of multicurrency_code only if not using original rate)
@@ -574,7 +574,7 @@ 
 			if (!empty($_facrec->frequency)) {  // Invoice are created on same thirdparty than template when there is a recurrence, but not necessarily when there is no recurrence.
 				$this->socid = $_facrec->socid;
 			}
-			$this->entity            = $_facrec->entity; // Invoice created in same entity than template
+			$this->entity = $_facrec->entity; // Invoice created in same entity than template
 
 			// Fields coming from GUI.
 			// @TODO Value of template should be used as default value on the form on the GUI, and we should here always use the value from GUI
@@ -613,7 +613,7 @@ 
 				$this->mode_reglement_id = 0;
 			}
 			$this->status = self::STATUS_DRAFT;
-			$this->statut = self::STATUS_DRAFT;	// deprecated
+			$this->statut = self::STATUS_DRAFT; // deprecated
 
 			$this->linked_objects = $_facrec->linkedObjectsIds;
 			// We do not add link to template invoice or next invoice will be linked to all generated invoices
@@ -859,7 +859,7 @@ 
 
 						// Complete vat rate with code
 						$vatrate = $newinvoiceline->tva_tx;
-						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', (string) $vatrate)) {
+						if ($newinvoiceline->vat_src_code && !preg_match('/\(.*\)/', (string) $vatrate)) {
 							$vatrate .= ' ('.$newinvoiceline->vat_src_code.')';
 						}
 
@@ -1079,7 +1079,7 @@ 
 						($_facrec->lines[$i]->date_end_fill == 1 && $previousdaynextdatewhen) ? $previousdaynextdatewhen : '',
 						0,
 						$tva_npr,
-						0,  // fk_remise_except
+						0, // fk_remise_except
 						'HT',
 						0,
 						$_facrec->lines[$i]->product_type,
@@ -1092,8 +1092,8 @@ 
 						$buyprice,
 						$_facrec->lines[$i]->label,
 						empty($_facrec->lines[$i]->array_options) ? null : $_facrec->lines[$i]->array_options,
-						100,	// situation percent is undefined on recurring invoice lines
-						0,  // fk_prev_id
+						100, // situation percent is undefined on recurring invoice lines
+						0, // fk_prev_id
 						$_facrec->lines[$i]->fk_unit,
 						$_facrec->lines[$i]->multicurrency_subprice,
 						$_facrec->lines[$i]->ref_ext,
@@ -1185,7 +1185,7 @@ 
 
 		$facture->fk_facture_source = $this->fk_facture_source;
 		$facture->type 			    = $this->type;
-		$facture->subtype 			= $this->subtype;
+		$facture->subtype = $this->subtype;
 		$facture->socid 		    = $this->socid;
 		$facture->date              = $this->date;
 		$facture->date_pointoftax   = $this->date_pointoftax;
@@ -1202,7 +1202,7 @@ 
 
 		$facture->origin            = $this->origin;
 		$facture->origin_id         = $this->origin_id;
-		$facture->fk_account         = $this->fk_account;
+		$facture->fk_account = $this->fk_account;
 
 		$facture->lines = $this->lines; // Array of lines of invoice
 		$facture->situation_counter = $this->situation_counter;
@@ -1676,7 +1676,7 @@ 
 	{
 		global $conf, $langs, $hookmanager, $action;
 
-		if (! in_array($origin->element, array('propal', 'commande'))) {
+		if (!in_array($origin->element, array('propal', 'commande'))) {
 			$origin->error = 'ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder';
 			return null;
 		}
@@ -1686,7 +1686,7 @@ 
 			return null;
 		}
 
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 		if ($date > (dol_get_last_hour(dol_now('tzuserrel')) + getDolGlobalInt('INVOICE_MAX_FUTURE_DELAY'))) {
 			$origin->error = 'ErrorDateIsInFuture';
@@ -1730,7 +1730,7 @@ 
 		$deposit->pos_source = $origin->pos_source;
 		$deposit->model_pdf = 'crabe';
 
-		$modelByTypeConfName = 'FACTURE_ADDON_PDF_' . $deposit->type;
+		$modelByTypeConfName = 'FACTURE_ADDON_PDF_'.$deposit->type;
 
 		if (getDolGlobalString($modelByTypeConfName)) {
 			$deposit->model_pdf = getDolGlobalString($modelByTypeConfName);
@@ -1790,10 +1790,10 @@ 
 					$descriptions[$key] = '';
 				}
 				$TTotalByTva[$key] += $line->total_ttc;
-				$descriptions[$key] .= '<li>' . (!empty($line->product_ref) ? $line->product_ref . ' - ' : '');
-				$descriptions[$key] .= (!empty($line->product_label) ? $line->product_label . ' - ' : '');
-				$descriptions[$key] .= $langs->trans('Qty') . ' : ' . $line->qty;
-				$descriptions[$key] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($line->total_ht) . '</li>';
+				$descriptions[$key] .= '<li>'.(!empty($line->product_ref) ? $line->product_ref.' - ' : '');
+				$descriptions[$key] .= (!empty($line->product_label) ? $line->product_label.' - ' : '');
+				$descriptions[$key] .= $langs->trans('Qty').' : '.$line->qty;
+				$descriptions[$key] .= ' - '.$langs->trans('TotalHT').' : '.price($line->total_ht).'</li>';
 			}
 
 			foreach ($TTotalByTva as $tva => &$total) {
@@ -1817,10 +1817,10 @@ 
 				$totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
 				$tva_tx = $lines[$i]->tva_tx;
 				$amountdeposit[$tva_tx] += ((float) $lines[$i]->total_ht * (float) $origin->deposit_percent) / 100;
-				$descriptions[$tva_tx] .= '<li>' . (!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref . ' - ' : '');
-				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label . ' - ' : '');
-				$descriptions[$tva_tx] .= $langs->trans('Qty') . ' : ' . $lines[$i]->qty;
-				$descriptions[$tva_tx] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($lines[$i]->total_ht) . '</li>';
+				$descriptions[$tva_tx] .= '<li>'.(!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref.' - ' : '');
+				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label.' - ' : '');
+				$descriptions[$tva_tx] .= $langs->trans('Qty').' : '.$lines[$i]->qty;
+				$descriptions[$tva_tx] .= ' - '.$langs->trans('TotalHT').' : '.price($lines[$i]->total_ht).'</li>';
 			}
 
 			if ($totalamount == 0) {
@@ -1835,11 +1835,11 @@ 
 				continue;
 			}
 
-			$descline = '(DEPOSIT) ('. $origin->deposit_percent .'%) - '.$origin->ref;
+			$descline = '(DEPOSIT) ('.$origin->deposit_percent.'%) - '.$origin->ref;
 
 			// Hidden conf
 			if (getDolGlobalString('INVOICE_DEPOSIT_VARIABLE_MODE_DETAIL_LINES_IN_DESCRIPTION') && !empty($descriptions[$tva])) {
-				$descline .= '<ul>' . $descriptions[$tva] . '</ul>';
+				$descline .= '<ul>'.$descriptions[$tva].'</ul>';
 			}
 
 			$addlineResult = $deposit->addline(
@@ -2214,9 +2214,9 @@ 
 				$this->id = $obj->rowid;
 				$this->entity = $obj->entity;
 
-				$this->ref					= $obj->ref;
-				$this->ref_client			= $obj->ref_client;
-				$this->ref_customer			= $obj->ref_client;
+				$this->ref = $obj->ref;
+				$this->ref_client = $obj->ref_client;
+				$this->ref_customer = $obj->ref_client;
 				$this->ref_ext				= $obj->ref_ext;
 				$this->type					= $obj->type;
 				$this->subtype				= $obj->subtype;
@@ -2242,7 +2242,7 @@ 
 				$this->fk_project = $obj->fk_project;
 				$this->project = null; // Clear if another value was already set by fetch_projet
 
-				$this->statut = $obj->status;	// deprecated
+				$this->statut = $obj->status; // deprecated
 				$this->status = $obj->status;
 
 				$this->date_lim_reglement = $this->db->jdate($obj->dlr);
@@ -2258,7 +2258,7 @@ 
 				$this->fk_fac_rec_source	= $obj->fk_fac_rec_source;
 				$this->note = $obj->note_private; // deprecated
 				$this->note_private = $obj->note_private;
-				$this->note_public			= $obj->note_public;
+				$this->note_public = $obj->note_public;
 				$this->user_creation_id     = $obj->fk_user_author;
 				$this->user_validation_id   = $obj->fk_user_valid;
 				$this->user_modification_id = $obj->fk_user_modif;
@@ -2372,7 +2372,7 @@ 
 				$line->ref              = $objp->product_ref; // Ref product
 				$line->product_ref      = $objp->product_ref; // Ref product
 				$line->libelle          = $objp->product_label; // deprecated
-				$line->product_label 	= $objp->product_label; // Label product
+				$line->product_label = $objp->product_label; // Label product
 				$line->product_barcode  = $objp->product_barcode; // Barcode number product
 				$line->product_desc     = $objp->product_desc; // Description product
 				$line->fk_product_type  = $objp->fk_product_type; // Type of product
@@ -3246,10 +3246,10 @@ 
 		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('facture', 'creer'))
 		|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('facture', 'invoice_advance', 'validate'))) {
 			$this->error = 'Permission denied';
-			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS=' . getDolGlobalString('MAIN_USE_ADVANCED_PERMS'), LOG_ERR);
+			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.getDolGlobalString('MAIN_USE_ADVANCED_PERMS'), LOG_ERR);
 			return -1;
 		}
-		if ((preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) &&	// empty should not happened, but when it occurs, the test save life
+		if ((preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) && // empty should not happened, but when it occurs, the test save life
 			getDolGlobalString('FAC_FORCE_DATE_VALIDATION')						// If option enabled, we force invoice date
 		) {
 			$this->date = dol_now();
@@ -3609,7 +3609,7 @@ 
 			// Set new ref and define current status
 			if (!$error) {
 				$this->ref = $num;
-				$this->statut = self::STATUS_VALIDATED;	// deprecated
+				$this->statut = self::STATUS_VALIDATED; // deprecated
 				$this->status = self::STATUS_VALIDATED;
 				$this->date_validation = $now;
 				$i = 0;
@@ -3764,7 +3764,7 @@ 
 
 			if ($error == 0) {
 				$old_statut = $this->status;
-				$this->statut = self::STATUS_DRAFT;	// deprecated
+				$this->statut = self::STATUS_DRAFT; // deprecated
 				$this->status = self::STATUS_DRAFT;
 
 				// Call trigger
@@ -4668,7 +4668,7 @@ 
 		}
 
 		if (!empty($addon)) {
-			dol_syslog("Call getNextNumRef with ".$addonConstName." = " . getDolGlobalString('FACTURE_ADDON').", thirdparty=".$soc->name.", type=".$soc->typent_code.", mode=".$mode, LOG_DEBUG);
+			dol_syslog("Call getNextNumRef with ".$addonConstName." = ".getDolGlobalString('FACTURE_ADDON').", thirdparty=".$soc->name.", type=".$soc->typent_code.", mode=".$mode, LOG_DEBUG);
 
 			$mybool = false;
 
@@ -5747,14 +5747,14 @@ 
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
 		}
-		$sql .= " WHERE f.paye = 0";	// Only unpaid
-		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED;	// Only validated status
+		$sql .= " WHERE f.paye = 0"; // Only unpaid
+		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED; // Only validated status
 		if ($datetouse == 'invoicedate') {
 			$sql .= " AND f.datef = '".$this->db->idate($tmpidate, 'gmt')."'";
 		} else {
 			$sql .= " AND f.date_lim_reglement = '".$this->db->idate($tmpidate, 'gmt')."'";
 		}
-		$sql .= " AND f.entity IN (".getEntity('facture', 0).")";	// One batch process only one company (no sharing)
+		$sql .= " AND f.entity IN (".getEntity('facture', 0).")"; // One batch process only one company (no sharing)
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '".$this->db->escape($paymentmode)."'";
 		}
@@ -5972,7 +5972,7 @@ 
 								$actioncomm->create($user);
 							}
 
-							$this->db->commit();	// We always commit
+							$this->db->commit(); // We always commit
 						}
 
 						if ($errormesg) {
@@ -6014,7 +6014,7 @@ 
 		// get date of last validated invoices of same type
 		$sql  = "SELECT datef";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql .= " WHERE type = " . (int) $this->type ;
+		$sql .= " WHERE type = ".(int) $this->type;
 		$sql .= " AND date_valid IS NOT NULL";
 		$sql .= " AND entity IN (".getEntity('invoice').")";
 		$sql .= " ORDER BY datef DESC LIMIT 1";
@@ -6272,7 +6272,7 @@ 
 			$objp = $this->db->fetch_object($result);
 
 			if (!$objp) {
-				$this->error = 'InvoiceLine with id '. $rowid .' not found sql='.$sql;
+				$this->error = 'InvoiceLine with id '.$rowid.' not found sql='.$sql;
 				return 0;
 			}
 
@@ -6303,7 +6303,7 @@ 
 			$this->total_localtax1		= $objp->total_localtax1;
 			$this->total_localtax2		= $objp->total_localtax2;
 			$this->total_ttc			= $objp->total_ttc;
-			$this->fk_code_ventilation  = $objp->fk_code_ventilation;
+			$this->fk_code_ventilation = $objp->fk_code_ventilation;
 			$this->rang					= $objp->rang;
 			$this->fk_fournprice = $objp->fk_fournprice;
 			$marginInfos				= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $this->fk_fournprice, $objp->pa_ht);
@@ -6694,7 +6694,7 @@ 
 		$sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
 		$sql .= ", product_type=".$this->product_type;
 		$sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
-		$sql .= ", special_code=" . (int) $this->special_code;
+		$sql .= ", special_code=".(int) $this->special_code;
 		if (empty($this->skip_update_total)) {
 			$sql .= ", total_ht=".price2num($this->total_ht);
 			$sql .= ", total_tva=".price2num($this->total_tva);