Dolibarr / dolibarr

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

Spacing +29 added lines, -29 removed lines

@@ -139,9 +139,9 @@ 
 		$this->url       = DOL_URL_ROOT.'/admin/modules.php?mode=marketplace';
 
 		// For dolistore modules
-		$this->dolistore_api_url = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV', 'https://www.dolistore.com/api/');	// 'https://www.dolistore.com/api/', 'https://admin2.dolibarr.org/api/index.php/marketplace/'
+		$this->dolistore_api_url = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV', 'https://www.dolistore.com/api/'); // 'https://www.dolistore.com/api/', 'https://admin2.dolibarr.org/api/index.php/marketplace/'
 		$this->dolistore_api_key = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_KEY', 'dolistorepublicapi');
-		$this->shop_url  = getDolGlobalString('MAIN_MODULE_DOLISTORE_SHOP_URL', 'https://www.dolistore.com');
+		$this->shop_url = getDolGlobalString('MAIN_MODULE_DOLISTORE_SHOP_URL', 'https://www.dolistore.com');
 
 		// For community modules
 		$this->file_source_url = "https://raw.githubusercontent.com/Dolibarr/dolibarr-community-modules/refs/heads/main/index.yaml";
@@ -204,12 +204,12 @@ 
 			$httpheader[] = 'Authorization: Basic '.base64_encode($basicAuthLogin.':'.$basicAuthPassword);
 		}
 
-		$url = $this->dolistore_api_url . (preg_match('/\/$/', $this->dolistore_api_url) ? '' : '/') . $resource;
+		$url = $this->dolistore_api_url.(preg_match('/\/$/', $this->dolistore_api_url) ? '' : '/').$resource;
 
 		$options['apikey'] = $this->dolistore_api_key;
 
 		if ($options) {
-			$url .= '?' . http_build_query($options);
+			$url .= '?'.http_build_query($options);
 		}
 
 		$response = getURLContent($url, 'GET', '', 1, $httpheader, array('https'), 0, -1, 5, 5);
@@ -251,13 +251,13 @@ 
 		$modules = array();
 
 		if (!empty($this->cache_file) && file_exists($this->cache_file)) {
-			dol_syslog(__METHOD__ . " - Loading cache file: " . $this->cache_file, LOG_DEBUG);
+			dol_syslog(__METHOD__." - Loading cache file: ".$this->cache_file, LOG_DEBUG);
 
 			$content = file_get_contents($this->cache_file);
 			if ($content !== false) {
 				$modules = $this->readYaml($content);
 			} else {
-				dol_syslog(__METHOD__ . " - Error reading cache file", LOG_ERR);
+				dol_syslog(__METHOD__." - Error reading cache file", LOG_ERR);
 			}
 		}
 
@@ -285,20 +285,20 @@ 
 		if (isset($resCategories['response']) && is_array($resCategories['response'])) {
 			$organized_tree = $resCategories['response'];
 		} else {
-			return $html ;
+			return $html;
 		}
 
 		$html = '';
 		foreach ($organized_tree as $key => $value) {
 			if ($value['label'] != "Versions" && $value['label'] != "Specials") {
-				$html .= '<li' . ($current == $value['rowid'] ? ' class="active"' : '') . '>';
-				$html .= '<a href="?mode=marketplace&categorie=' . $value['rowid'] . '">' . $value['label'] . '</a>';
+				$html .= '<li'.($current == $value['rowid'] ? ' class="active"' : '').'>';
+				$html .= '<a href="?mode=marketplace&categorie='.$value['rowid'].'">'.$value['label'].'</a>';
 				if (isset($value['children'])) {
 					$html .= '<ul>';
 					usort($value['children'], $this->buildSorter('position'));
 					foreach ($value['children'] as $key_children => $value_children) {
-						$html .= '<li' . ($current == $value_children['rowid'] ? ' class="active"' : '') . '>';
-						$html .= '<a href="?mode=marketplace&categorie=' . $value_children['rowid'] . '" title="' . dol_escape_htmltag(strip_tags($value_children['description'])) . '">' . $value_children['label'] . '</a>';
+						$html .= '<li'.($current == $value_children['rowid'] ? ' class="active"' : '').'>';
+						$html .= '<a href="?mode=marketplace&categorie='.$value_children['rowid'].'" title="'.dol_escape_htmltag(strip_tags($value_children['description'])).'">'.$value_children['label'].'</a>';
 						$html .= '</li>';
 					}
 					$html .= '</ul>';
@@ -321,7 +321,7 @@ 
 
 		$html       = "";
 		$last_month = dol_now() - (30 * 24 * 60 * 60);
-		$dolibarrversiontouse = DOL_VERSION;	// full string with version
+		$dolibarrversiontouse = DOL_VERSION; // full string with version
 
 		$this->products = array();
 
@@ -330,7 +330,7 @@ 
 		$this->no_page  = $options['no_page'] ?? 1;
 		$this->search    = $options['search'] ?? '';
 
-		$this->per_page = 11;	// We fix number of products per page to 11
+		$this->per_page = 11; // We fix number of products per page to 11
 
 		// Length of $search must be at least 2 characters
 		if (!empty($this->search) && strlen(str_replace(' ', '', (string) $this->search)) < 2) {
@@ -371,7 +371,7 @@ 
 		$fileProducts = array();
 		$fileProductsTotal = 0;
 		if (!empty($this->githubFileStatus) && getDolGlobalInt('MAIN_ENABLE_EXTERNALMODULES_COMMUNITY')) {
-			$fileProducts = $this->fetchModulesFromFile($data);			// Return an array with all modules from the cache filecontent in $data
+			$fileProducts = $this->fetchModulesFromFile($data); // Return an array with all modules from the cache filecontent in $data
 
 			$fileProducts = $this->adaptData($fileProducts, 'githubcommunity');
 
@@ -429,7 +429,7 @@ 
 					$download_link .= img_picto('', 'file-code', 'class="size2x paddingright"');
 					$download_link .= '</a>';
 
-					$urlview = $product["dolistore-download"];		// In a future, we will have the download to the zip file
+					$urlview = $product["dolistore-download"]; // In a future, we will have the download to the zip file
 					if ($urlview) {
 						$download_link .= '<a class="paddingleft paddingright" target="_blank" title="'.$langs->trans("View").'" href="'.$urlview.'" rel="noopener noreferrer">';
 						$download_link .= img_picto('', 'url', 'class="size2x"');
@@ -447,7 +447,7 @@ 
 						}
 					}
 				} elseif ($product['source'] === 'dolistore') {
-					$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p=' . $product['id'];
+					$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p='.$product['id'];
 					$download_link = '<a class="paddingleft paddingright" target="_blank" title="'.$langs->trans("View").'" href="'.$this->shop_url.'/product.php?id='.((int) $product["id"]).'">';
 					$download_link .= img_picto('', 'url', 'class="size2x"');
 					$download_link .= '</a>';
@@ -505,12 +505,12 @@ 
 			// Output the line
 			$html .= '<tr class="app oddeven nohover '.dol_escape_htmltag($compatible).'">';
 			$html .= '<td class="center width150"><div class="newAppParent">';
-			$html .= $newapp.$images;	// No dol_escape_htmltag, it is already escape html
+			$html .= $newapp.$images; // No dol_escape_htmltag, it is already escape html
 			$html .= '</div></td>';
 			$html .= '<td class="margeCote"><h2 class="appTitle">';
 			$html .= dol_escape_htmltag(dol_string_nohtmltag($product["label"]));
 			$html .= '<br><small>';
-			$html .= $version;			// No dol_escape_htmltag, it is already escape html
+			$html .= $version; // No dol_escape_htmltag, it is already escape html
 			$html .= '</small></h2>';
 			$html .= '<small> ';
 			if (empty($product['tms'])) {
@@ -543,7 +543,7 @@ 
 
 		$this->numberOfProducts = count($this->products);
 
-		return $html ;
+		return $html;
 	}
 
 	/**
@@ -560,7 +560,7 @@ 
 		 * @param array<string, mixed> $b
 		 * @return int
 		 */
-		function (array $a, array $b) use ($key) {
+		function(array $a, array $b) use ($key) {
 			$valA = isset($a[$key]) && is_scalar($a[$key]) ? (string) $a[$key] : '';
 			$valB = isset($b[$key]) && is_scalar($b[$key]) ? (string) $b[$key] : '';
 
@@ -719,7 +719,7 @@ 
 				$pagelist .= '<li class="pagination">';
 				$pagelist .= '<label for="page_input">Page </label>';
 				if ($this->categorie != 0) {
-					$pagelist .= '<input type="hidden" name="categorie" value="' . $this->categorie . '">';
+					$pagelist .= '<input type="hidden" name="categorie" value="'.$this->categorie.'">';
 				}
 				$pagelist .= '<input type="text" id="page_input" name="no_page" value="'.($page).'" min="1" max="'.$nbpages.'" class="width40 page_input" oninput="if(this.value > '.$nbpages.') this.value='.$nbpages.'">';
 				$pagelist .= ' / '.$nbpages;
@@ -769,17 +769,17 @@ 
 		}
 
 		// Get the predefined error message or use a default one
-		$error_message = $error_messages[$request['status_code']] ?? 'Unexpected HTTP status: ' . $request['status_code'];
+		$error_message = $error_messages[$request['status_code']] ?? 'Unexpected HTTP status: '.$request['status_code'];
 
 		// Append error details if available
 		if (!empty($request['response']) && isset($request['response']['errors']) && is_array($request['response']['errors'])) {
 			foreach ($request['response']['errors'] as $error) {
-				$error_message .= ' - (Code ' . $error['code'] . '): ' . $error['message'];
+				$error_message .= ' - (Code '.$error['code'].'): '.$error['message'];
 			}
 		}
 
 		if (!empty($request['curl_error_msg'])) {
-			$error_message .= ' - ' . $request['curl_error_msg'];
+			$error_message .= ' - '.$request['curl_error_msg'];
 		}
 
 		// Return the formatted error message
@@ -807,7 +807,7 @@ 
 		if (!file_exists($cache_file) || filemtime($cache_file) < (dol_now() - $cache_time)) {
 			// We get remote url
 			$addheaders = array();
-			$result = getURLContent($file_source_url, 'GET', '', 1, $addheaders);	// TODO Force timeout to 5 s on both connect and response.
+			$result = getURLContent($file_source_url, 'GET', '', 1, $addheaders); // TODO Force timeout to 5 s on both connect and response.
 			if (!empty($result) && $result['http_code'] == 200) {
 				$yaml = $result['content'];
 				file_put_contents($cache_file, $yaml);
@@ -912,7 +912,7 @@ 
 					continue;
 				}
 				$adaptedPackage = [
-					'ref' => str_replace(' ', '', $package['modulename'] . '-' . $package['current_version'] . '@' .
+					'ref' => str_replace(' ', '', $package['modulename'].'-'.$package['current_version'].'@'.
 						(array_key_exists('author', $package) ? $package['author'] : 'unkownauthor')),
 					'label' => !empty($package['label'][substr($this->lang, 0, 2)])
 						? $package['label'][substr($this->lang, 0, 2)]
@@ -1017,7 +1017,7 @@ 
 			 *
 			 * @return int
 			 */
-			static function ($a, $b) {
+			static function($a, $b) {
 				return strtotime($b['datec'] ?? '0') - strtotime($a['datec'] ?? '0');
 			}
 		);
@@ -1032,7 +1032,7 @@ 
 				 *
 				 * @return bool
 				 */
-				static function ($package) use ($options) {
+				static function($package) use ($options) {
 					return stripos($package['label'], $options['search']) !== false || stripos($package['description'], $options['search']) !== false;
 				}
 			);
@@ -1048,7 +1048,7 @@ 
 				 *
 				 * @return bool
 				 */
-				static function ($package) use ($options) {
+				static function($package) use ($options) {
 					return in_array($options['categorieid'], $package['category']);
 				}
 			);

htdocs/societe/card.php

Spacing +69 added lines, -69 removed lines

@@ -117,8 +117,8 @@ 
 $cancel		= GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$confirm 	= GETPOST('confirm', 'alpha');
-$canvas		= GETPOST('canvas', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$canvas = GETPOST('canvas', 'alpha');
 
 $dol_openinpopup = '';
 
@@ -161,10 +161,10 @@ 
 }
 
 // Permissions
-$permissiontoread 	= $user->hasRight('societe', 'lire');
-$permissiontoadd 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoread = $user->hasRight('societe', 'lire');
+$permissiontoadd = $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->hasRight('societe', 'supprimer') || ($permissiontoadd && isset($object->status) && $object->status == 0);
-$permissionnote 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php
 $permissiondellink 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_dellink.inc.php
 $permissiontoeditextra = $permissiontoadd;
 if (GETPOST('attribute', 'aZ09') && isset($extrafields->attributes[$object->table_element]['perms'][GETPOST('attribute', 'aZ09')])) {
@@ -172,7 +172,7 @@ 
 	$permissiontoeditextra = dol_eval($extrafields->attributes[$object->table_element]['perms'][GETPOST('attribute', 'aZ09')]);
 }
 
-$upload_dir 		= $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
+$upload_dir = $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 // Security check
 $result = restrictedArea($user, 'societe', $object->id, '&societe', '', 'fk_soc', 'rowid', 0);
@@ -201,7 +201,7 @@ 
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = DOL_URL_ROOT.'/societe/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__') . (!empty($canvas) ? "&canvas=" . $canvas : "");
+				$backtopage = DOL_URL_ROOT.'/societe/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__').(!empty($canvas) ? "&canvas=".$canvas : "");
 			}
 		}
 	}
@@ -219,7 +219,7 @@ 
 
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $permissiontoadd) {
 		$soc_origin_id = GETPOSTINT('soc_origin');
-		$soc_origin = new Societe($db);		// The thirdparty that we will delete
+		$soc_origin = new Societe($db); // The thirdparty that we will delete
 
 		if ($soc_origin_id <= 0) {
 			$langs->load('errors');
@@ -267,7 +267,7 @@ 
 	if ($action == 'update_extras' && $permissiontoeditextra) {
 		$object->fetch($socid);
 
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		$attribute_name = GETPOST('attribute', 'aZ09');
 
@@ -323,7 +323,7 @@ 
 		if (!$error) {
 			if ($action == 'update') {	// Test on permission not required here
 				$ret = $object->fetch($socid);
-				$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+				$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 			} else {
 				$object->canvas = $canvas;
 			}
@@ -334,19 +334,19 @@ 
 				$object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
 				$object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
 				// Add non official properties
-				$object->name_bis			= GETPOST('name', 'alphanohtml');
-				$object->firstname			= GETPOST('firstname', 'alphanohtml');
+				$object->name_bis = GETPOST('name', 'alphanohtml');
+				$object->firstname = GETPOST('firstname', 'alphanohtml');
 			} else {
-				$object->name				= GETPOST('name', 'alphanohtml');
+				$object->name = GETPOST('name', 'alphanohtml');
 			}
 			$object->entity					= ((GETPOSTISSET('entity') && GETPOST('entity') != '') ? GETPOSTINT('entity') : $conf->entity);
-			$object->name_alias				= GETPOST('name_alias', 'alphanohtml');
+			$object->name_alias = GETPOST('name_alias', 'alphanohtml');
 			$object->parent					= GETPOSTISSET('parent_company_id') ? GETPOSTINT('parent_company_id') : $object->parent;
 			$object->address				= GETPOST('address', 'alphanohtml');
-			$object->zip					= GETPOST('zipcode', 'alphanohtml');
-			$object->town					= GETPOST('town', 'alphanohtml');
-			$object->country_id				= GETPOSTINT('country_id');
-			$object->state_id				= GETPOSTINT('state_id');
+			$object->zip = GETPOST('zipcode', 'alphanohtml');
+			$object->town = GETPOST('town', 'alphanohtml');
+			$object->country_id = GETPOSTINT('country_id');
+			$object->state_id = GETPOSTINT('state_id');
 
 			$object->socialnetworks = array();
 			if (isModEnabled('socialnetworks')) {
@@ -358,10 +358,10 @@ 
 			}
 
 			$object->phone					= GETPOST('phone', 'alpha');
-			$object->phone_mobile 			= (string) GETPOST("phone_mobile", 'alpha');
+			$object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
 			$object->fax					= GETPOST('fax', 'alpha');
 			$object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
-			$object->no_email 				= GETPOSTINT("no_email");
+			$object->no_email = GETPOSTINT("no_email");
 			$object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
 			$object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
 			$object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
@@ -371,13 +371,13 @@ 
 			$object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
 			$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
 			$object->code_client			= GETPOSTISSET('customer_code') ? GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
-			$object->code_fournisseur		= GETPOSTISSET('supplier_code') ? GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
+			$object->code_fournisseur = GETPOSTISSET('supplier_code') ? GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
 			$object->capital				= GETPOSTFLOAT('capital');
 			$object->barcode				= GETPOST('barcode', 'alphanohtml');
 
 			$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
 			$object->tva_assuj				= GETPOSTINT('assujtva_value');
-			$object->vat_reverse_charge		= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
+			$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 			$object->status = GETPOSTINT('status');
 
 			// Local Taxes
@@ -387,9 +387,9 @@ 
 			$object->localtax1_value		= GETPOST('lt1', 'alpha');
 			$object->localtax2_value		= GETPOST('lt2', 'alpha');
 
-			$object->forme_juridique_code	= GETPOSTINT('forme_juridique_code');
+			$object->forme_juridique_code = GETPOSTINT('forme_juridique_code');
 			$object->effectif_id			= GETPOSTINT('effectif_id');
-			$object->typent_id				= GETPOSTINT('typent_id');
+			$object->typent_id = GETPOSTINT('typent_id');
 
 			$object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
 
@@ -398,8 +398,8 @@ 
 			$prospect = (GETPOSTINT('prospect') > 0 ? 2 : 0);
 			$prospectcustomer = $customer + $prospect;
 
-			$object->client					= $prospectcustomer;
-			$object->fournisseur			= (GETPOSTINT('supplier') > 0 ? 1 : 0);
+			$object->client = $prospectcustomer;
+			$object->fournisseur = (GETPOSTINT('supplier') > 0 ? 1 : 0);
 
 			if ($action == 'add') {
 				// for prospect, customer or supplier
@@ -419,7 +419,7 @@ 
 					}
 
 					if ($object->fournisseur > 0) {
-						$object->cond_reglement_supplier_id	= $paymentTermId;
+						$object->cond_reglement_supplier_id = $paymentTermId;
 
 						$filterPaymentTypeIdArr = array(1, 2, 3); // allow payment type for supplier (filter is "DBIT" in "Form::select_types_paiements()" method)
 						if (!empty($form->cache_types_paiements[$paymentTypeId]) && isset($form->cache_types_paiements[$paymentTypeId]['type']) && in_array($form->cache_types_paiements[$paymentTypeId]['type'], $filterPaymentTypeIdArr)) {
@@ -429,15 +429,15 @@ 
 				}
 			}
 
-			$object->commercial_id			= GETPOSTINT('commercial_id');
-			$object->default_lang			= GETPOST('default_lang');
+			$object->commercial_id = GETPOSTINT('commercial_id');
+			$object->default_lang = GETPOST('default_lang');
 
 			// Webservices url/key
 			$object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
 			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
 
 			if (GETPOSTISSET('accountancy_code_sell')) {
-				$accountancy_code_sell		= GETPOST('accountancy_code_sell', 'alpha');
+				$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 				if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 					$object->accountancy_code_sell = '';
@@ -446,7 +446,7 @@ 
 				}
 			}
 			if (GETPOSTISSET('accountancy_code_buy')) {
-				$accountancy_code_buy		= GETPOST('accountancy_code_buy', 'alpha');
+				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 
 				if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 					$object->accountancy_code_buy = '';
@@ -821,7 +821,7 @@ 
 	// Delete third party
 	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('societe', 'supprimer')) {
 		$object->fetch($socid);
-		$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 		$result = $object->delete($socid, $user);
 
 		if ($result > 0) {
@@ -899,7 +899,7 @@ 
 				} else {
 					$db->commit();
 					$db->close();
-					header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 					exit;
 				}
 			} else {
@@ -1080,21 +1080,21 @@ 
 		}
 
 		$object->phone				= GETPOST('phone', 'alpha');
-		$object->phone_mobile       = (string) GETPOST("phone_mobile", 'alpha');
+		$object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
 		$object->fax				= GETPOST('fax', 'alpha');
 		$object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
 		$object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
-		$object->capital			= GETPOSTFLOAT('capital');
+		$object->capital = GETPOSTFLOAT('capital');
 		$paymentTermId = GETPOSTINT('cond_reglement_id'); // can be set by default values on create page and not already in get or post variables
 		if (empty($paymentTermId) && !GETPOSTISSET('cond_reglement_id')) {
 			$paymentTermId = getDolGlobalString('MAIN_DEFAULT_PAYMENT_TERM_ID');
 		}
-		$object->cond_reglement_id	= $paymentTermId;
+		$object->cond_reglement_id = $paymentTermId;
 		$paymentTypeId = GETPOSTINT('mode_reglement_id'); // can be set by default values on create page and not already in get or post variables
 		if (empty($paymentTypeId) && !GETPOSTISSET('mode_reglement_id')) {
 			$paymentTypeId = getDolGlobalString('MAIN_DEFAULT_PAYMENT_TYPE_ID');
 		}
-		$object->mode_reglement_id 	= $paymentTypeId;
+		$object->mode_reglement_id = $paymentTypeId;
 		$object->barcode			= GETPOST('barcode', 'alphanohtml');
 		$object->idprof1			= GETPOST('idprof1', 'alphanohtml');
 		$object->idprof2			= GETPOST('idprof2', 'alphanohtml');
@@ -1107,7 +1107,7 @@ 
 		$object->civility_id		= GETPOST('civility_id', 'alpha');
 
 		$object->tva_assuj = GETPOSTINT('assujtva_value');
-		$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
+		$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 		$object->status = GETPOSTINT('status');
 
 		//Local Taxes
@@ -1123,7 +1123,7 @@ 
 		$object->default_lang = GETPOST('default_lang');
 
 		if (GETPOSTISSET('accountancy_code_sell')) {
-			$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+			$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 			if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 				$object->accountancy_code_sell = '';
@@ -1132,7 +1132,7 @@ 
 			}
 		}
 		if (GETPOSTISSET('accountancy_code_buy')) {
-			$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+			$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 
 			if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 				$object->accountancy_code_buy = '';
@@ -1257,7 +1257,7 @@ 
 
 			print '<script type="text/javascript">';
 			print '$(document).ready(function () {
-					var canHaveCustomerCategoryIfNotCustomerProspectSupplier = ' . (!getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '0' : '1') . ';
+					var canHaveCustomerCategoryIfNotCustomerProspectSupplier = ' . (!getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '0' : '1').';
 
 					init_customer_categ();
 			  		$("#customerprospect").change(function() {
@@ -1329,7 +1329,7 @@ 
 			print '</td><td'.(getDolGlobalString('SOCIETE_USEPREFIX') ? '' : ' colspan="3"').'>';
 
 			print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
-			print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300');	// For some countries that need the company name in 2 languages
+			print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300'); // For some countries that need the company name in 2 languages
 			// This implementation of the feature to search already existing company has been disabled. It must be implemented by keeping the "input text" and we must call the search ajax societe/ajax/ajaxcompanies.php
 			// on a keydown of the input. We should show data about a duplicate found if we found less than 5 answers into a div under the input.
 			/*
@@ -1449,8 +1449,8 @@ 
 
 			// Prospect/Customer/Supplier
 			$selected = $object->client;
-			$selectedcustomer = (getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')==1 || getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')==3 ? 1 : 0);
-			$selectedprospect = (getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')==2 || getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')==3 ? 1 : 0);
+			$selectedcustomer = (getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT') == 1 || getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT') == 3 ? 1 : 0);
+			$selectedprospect = (getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT') == 2 || getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT') == 3 ? 1 : 0);
 			switch ($selected) {
 				case 1:
 					$selectedcustomer = 1;
@@ -1702,7 +1702,7 @@ 
 					print '<td></td>';
 					print '<td></td>';
 				}
-				print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email') .' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
+				print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email').' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
 				print '<td class="individualline" '.(($conf->browser->layout == 'phone') || !isModEnabled('mailing') ? ' colspan="3"' : '').'>'.$form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ? GETPOST("contact_no_email", 'alpha') : (empty($object->no_email) ? 0 : 1)), 1, false, 1).'</td>';
 				print '</tr>';
 			}
@@ -1750,7 +1750,7 @@ 
 			// Vat is used
 			print '<tr><td><label for="assujtva_value">'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</label></td>';
 			print '<td>';
-			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? (GETPOST('assujtva_value', 'alpha') != '' ? ' checked="checked"' : '') : 'checked="checked"') . ' value="1">'; // Assujeti par default en creation
+			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" '.(GETPOSTISSET('assujtva_value') ? (GETPOST('assujtva_value', 'alpha') != '' ? ' checked="checked"' : '') : 'checked="checked"').' value="1">'; // Assujeti par default en creation
 			print '</td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
@@ -1791,7 +1791,7 @@ 
 
 			// VAT reverse charge by default
 			if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
-				print '<tr><td><label for="vat_reverse_charge">' . $form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0) . '</label></td><td colspan="3">';
+				print '<tr><td><label for="vat_reverse_charge">'.$form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0).'</label></td><td colspan="3">';
 				print '<input type="checkbox" name="vat_reverse_charge" id="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').'>';
 				print '</td></tr>';
 			}
@@ -1800,21 +1800,21 @@ 
 			//TODO: Place into a function to control showing by country or study better option
 			if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
 				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
-				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '').' value="1">';
 				print '</td>';
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
 				}
 				print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
-				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '').' value="1">';
 				print '</td></tr>';
 			} elseif ($mysoc->localtax1_assuj == "1") {
 				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
-				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '').' value="1">';
 				print '</td></tr>';
 			} elseif ($mysoc->localtax2_assuj == "1") {
 				print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
-				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '').' value="1">';
 				print '</td></tr>';
 			}
 
@@ -2051,7 +2051,7 @@ 
 				$prefixSupplierIsUsed = false;
 			}
 
-			$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+			$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 
 			if (GETPOSTISSET('name')) {
 				// We overwrite with values if posted
@@ -2079,10 +2079,10 @@ 
 				}
 
 				$object->phone					= GETPOST('phone', 'alpha');
-				$object->phone_mobile			= (string) GETPOST('phone_mobile', 'alpha');
+				$object->phone_mobile = (string) GETPOST('phone_mobile', 'alpha');
 				$object->fax					= GETPOST('fax', 'alpha');
 				$object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-				$object->no_email				= GETPOSTINT("no_email");
+				$object->no_email = GETPOSTINT("no_email");
 				$object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
 				$object->capital				= GETPOSTFLOAT('capital');
 				$object->idprof1				= GETPOST('idprof1', 'alphanohtml');
@@ -2098,16 +2098,16 @@ 
 				$object->default_lang = GETPOST('default_lang', 'alpha');
 
 				$object->tva_assuj				= GETPOSTINT('assujtva_value');
-				$object->vat_reverse_charge		= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
+				$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
-				$object->status =				GETPOSTINT('status');
+				$object->status = GETPOSTINT('status');
 
 				// Webservices url/key
 				$object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
 				$object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
 				if (GETPOSTISSET('accountancy_code_sell')) {
-					$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+					$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 					if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 						$object->accountancy_code_sell = '';
@@ -2116,7 +2116,7 @@ 
 					}
 				}
 				if (GETPOSTISSET('accountancy_code_buy')) {
-					$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+					$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 
 					if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 						$object->accountancy_code_buy = '';
@@ -2198,7 +2198,7 @@ 
     				}
     			});
 
-				var canHaveCustomerCategoryIfNotCustomerProspect = ' . (getDolGlobalInt('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '1' : '0') . ';
+				var canHaveCustomerCategoryIfNotCustomerProspect = ' . (getDolGlobalInt('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '1' : '0').';
 
 				init_customer_categ();
 	  			$("#customerprospect").change(function() {
@@ -2384,7 +2384,7 @@ 
 					$colspan = 3;
 				}
 
-				print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"': '').'>';
+				print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
 				print '<table class="nobordernopadding"><tr><td>';
 				$tmpcode = $object->code_client ?? '';
 				if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
@@ -2401,7 +2401,7 @@ 
 					print '</tr><tr>';
 				}
 
-				print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"': '').'>';
+				print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
 
 				if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 					print '<table class="nobordernopadding"><tr><td>';
@@ -2582,14 +2582,14 @@ 
 
 				// VAT is used
 				print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
-				print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . ($object->tva_assuj ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="assujtva_value" name="assujtva_value" type="checkbox" '.($object->tva_assuj ? 'checked="checked"' : '').' value="1">';
 				print '</td></tr>';
 
 				// Local Taxes
 				//TODO: Place into a function to control showing by country or study better option
 				if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
 					print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td>';
-					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . ($object->localtax1_assuj ? 'checked="checked"' : '') . ' value="1">';
+					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.($object->localtax1_assuj ? 'checked="checked"' : '').' value="1">';
 					if (!isOnlyOneLocalTax(1)) {
 						print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(1, (float) $object->localtax1_value, "lt1");
@@ -2598,7 +2598,7 @@ 
 					print '</td>';
 					print '</tr><tr>';
 					print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
-					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . ($object->localtax2_assuj ? 'checked="checked"' : '') . ' value="1"></td></tr>';
+					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.($object->localtax2_assuj ? 'checked="checked"' : '').' value="1"></td></tr>';
 					if (!isOnlyOneLocalTax(2)) {
 						print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(2, (float) $object->localtax2_value, "lt2");
@@ -2607,7 +2607,7 @@ 
 					print '</td></tr>';
 				} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1") {
 					print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
-					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . ($object->localtax1_assuj ? 'checked="checked"' : '') . ' value="1">';
+					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.($object->localtax1_assuj ? 'checked="checked"' : '').' value="1">';
 					if (!isOnlyOneLocalTax(1)) {
 						print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(1, (float) $object->localtax1_value, "lt1");
@@ -2616,7 +2616,7 @@ 
 					print '</td></tr>';
 				} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1") {
 					print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
-					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . ($object->localtax2_assuj ? 'checked="checked"' : '') . ' value="1">';
+					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.($object->localtax2_assuj ? 'checked="checked"' : '').' value="1">';
 					if (!isOnlyOneLocalTax(2)) {
 						print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(2, (float) $object->localtax2_value, "lt2");
@@ -2627,7 +2627,7 @@ 
 
 				// VAT reverse charge by default
 				if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
-					print '<tr><td>' . $form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0) . '</td><td colspan="3">';
+					print '<tr><td>'.$form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0).'</td><td colspan="3">';
 					print '<input type="checkbox" name="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').'>';
 					print '</td></tr>';
 				}
@@ -2782,7 +2782,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" class="flat" name="photo" id="photoinput">';
 					print '</td></tr>';
@@ -3018,7 +3018,7 @@ 
 					print '<tr><td>';
 					print $form->textwithpicto($langs->trans('VATReverseChargeByDefault'), $langs->trans('VATReverseChargeByDefaultDesc'));
 					print '</td><td>';
-					print '<input type="checkbox" name="vat_reverse_charge" ' . ($object->vat_reverse_charge == '1' ? ' checked' : '') . ' disabled>';
+					print '<input type="checkbox" name="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').' disabled>';
 					print '</td>';
 					print '</tr>';
 				}