diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 1bbd13d9022..e6bcc7ad12e 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -8,6 +8,8 @@ $finder = (new PhpCsFixer\Finder())
 	'custom',
 	'documents',
 	'doctemplates',
+	'vendor',
+	'install/doctemplates',
 	'htdocs/custom',
 	'htdocs/includes',
 	'htdocs/install/doctemplates',
diff --git a/dev/tools/php-cs-fixer/run-php-cs-fixer.sh b/dev/tools/php-cs-fixer/run-php-cs-fixer.sh
index b62befcf011..d8c9d4ae6bb 100755
--- a/dev/tools/php-cs-fixer/run-php-cs-fixer.sh
+++ b/dev/tools/php-cs-fixer/run-php-cs-fixer.sh
@@ -36,7 +36,7 @@ MINPHPVERSION="7.0"
 echo "***** run-php-cs-fixer.sh *****"
 
 if [ "x$1" = "x" ]; then
-	echo "Syntax: run-php-cs-fixer.sh check|fix  [path]"
+	echo "Syntax: run-php-cs-fixer.sh check|fix  [path_from_root_project]"
 	exit 1;
 fi
 
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 55ee3bbd697..f28198d94b1 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -82,7 +82,7 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->hasRight('
 	if ($forcelangprod == $current_lang) {
 		$object->label		 = GETPOST("libelle", 'alphanohtml');
 		$object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
-		//$object->other		 = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
+	//$object->other		 = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
 	} else {
 		$object->multilangs[$forcelangprod]["label"] = GETPOST("libelle", 'alphanohtml');
 		$object->multilangs[$forcelangprod]["description"] = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index a6ff78a0ba0..1f5ce168fa5 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -560,7 +560,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						$morehtml .= '<br>'.imap_last_error();
 					}
 					dol_syslog("Error ".$morehtml, LOG_WARNING);
-					//var_dump(imap_errors())
+				//var_dump(imap_errors())
 				} else {
 					dol_syslog("Imap connected. Now we call imap_num_msg()");
 					$morehtml .= imap_num_msg($connection);
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 78fed9249ea..cf8c1ef77aa 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -918,7 +918,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 						$urlpage = $page;
 						if ($i++) {
 							$codetoconfig .= '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
-							//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
+						//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
 						} else {
 							if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs)) {
 								$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 5afd1ce8c85..39f0d3c0108 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -132,7 +132,7 @@ if ($action == 'add_currency') {
 	if (GETPOSTISSET('modify_apilayer')) {
 		dolibarr_set_const($db, 'MULTICURRENCY_APP_ID', GETPOST('MULTICURRENCY_APP_ID', 'alpha'));
 		dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'));
-		//dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
+	//dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
 	} else {
 		$multiurrency = new MultiCurrency($db);
 		$result = $multiurrency->syncRates(getDolGlobalString('MULTICURRENCY_APP_ID'));
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 78765aae04e..741633bf678 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -137,7 +137,7 @@ if ($action == 'setfixednotif' && $user->admin) {
 
 				$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
 				$newval = GETPOST($shortkey.'_key');
-				//print $newkey.' - '.$newval.'<br>';
+			//print $newkey.' - '.$newval.'<br>';
 			} elseif (preg_match('/^NOTIF_(.*)_new_key/', $key, $reg)) {
 				// Add a new entry
 				$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
@@ -304,7 +304,7 @@ foreach ($listofnotifiedevents as $notifiedevent) {
 		$model = 'expensereport_send';
 	} elseif ($notifiedevent['elementtype'] == 'order_supplier') {
 		$model = 'order_supplier_send';
-		// } elseif ($notifiedevent['elementtype'] == 'invoice_supplier') $model = 'invoice_supplier_send';
+	// } elseif ($notifiedevent['elementtype'] == 'invoice_supplier') $model = 'invoice_supplier_send';
 	} elseif ($notifiedevent['elementtype'] == 'member') {
 		$model = 'member';
 	}
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index e45d581c35f..58a94b273bb 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -313,7 +313,7 @@ print '<br>';
 print '<strong>$dolibarr_main_restrict_ip</strong>: ';
 if (empty($dolibarr_main_restrict_ip)) {
 	print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
-	//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
+//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
 } else {
 	print $dolibarr_main_restrict_ip;
 }
@@ -332,7 +332,7 @@ if (!getDolGlobalString('SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF')) {
 	print '<strong>$dolibarr_main_db_pass</strong>: ';
 	if (!empty($dolibarr_main_db_pass) && empty($dolibarr_main_db_encrypted_pass)) {
 		print img_picto('', 'warning').' '.$langs->trans("DatabasePasswordNotObfuscated").' &nbsp; &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("SetOptionTo", $langs->transnoentitiesnoconv("MainDbPasswordFileConfEncrypted"), yn(1)).')</span>';
-		//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
+	//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
 	} else {
 		print img_picto('', 'tick').' '.$langs->trans("DatabasePasswordObfuscated");
 	}
@@ -350,7 +350,7 @@ print '<span class="bold"> -> PHP streams allowed = </span>';
 $arrayofstreams = stream_get_wrappers();
 if (!empty($arrayofstreams)) {
 	sort($arrayofstreams);
-	print (join(',', $arrayofstreams)).' &nbsp; &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("TryToKeepOnly", 'file,http,https,php').')</span>'."\n";
+	print(join(',', $arrayofstreams)).' &nbsp; &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("TryToKeepOnly", 'file,http,https,php').')</span>'."\n";
 }
 
 print '<br>';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 9789527d024..1165e66d7e3 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -144,76 +144,76 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 		print '<div class="formelementrow centpercent">';
 		// Parameteres execution
 		$command = $db->getPathOfRestore();
-	if (preg_match("/\s/", $command)) {
-		$command = $command = escapeshellarg($command); // Use quotes on command
-	}
+		if (preg_match("/\s/", $command)) {
+			$command = $command = escapeshellarg($command); // Use quotes on command
+		}
 
 		$param = $dolibarr_main_db_name;
 		$param .= " -h ".$dolibarr_main_db_host;
-	if (!empty($dolibarr_main_db_port)) {
-		$param .= " -P ".$dolibarr_main_db_port;
-	}
+		if (!empty($dolibarr_main_db_port)) {
+			$param .= " -P ".$dolibarr_main_db_port;
+		}
 		$param .= " -u ".$dolibarr_main_db_user;
 		$paramcrypted = $param;
 		$paramclear = $param;
-	if (!empty($dolibarr_main_db_pass)) {
-		$paramcrypted .= " -p".preg_replace('/./i', '*', $dolibarr_main_db_pass);
-		$paramclear .= " -p".$dolibarr_main_db_pass;
-	}
+		if (!empty($dolibarr_main_db_pass)) {
+			$paramcrypted .= " -p".preg_replace('/./i', '*', $dolibarr_main_db_pass);
+			$paramclear .= " -p".$dolibarr_main_db_pass;
+		}
 
 		echo $langs->trans("ImportMySqlDesc");
 		print '<br>';
 		print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportMySqlCommand", $command, ($showpass ? $paramclear : $paramcrypted)).'</textarea><br>';
 		print ajax_autoselect('restorecommand');
 
-	if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) {
-		print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=mysql_options">'.$langs->trans("UnHidePassword").'</a>';
-	}
+		if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) {
+			print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=mysql_options">'.$langs->trans("UnHidePassword").'</a>';
+		}
 		//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
 		print '</div>';
 		print '</fieldset>';
-} elseif (in_array($type, array('pgsql'))) {
-	print '<fieldset id="postgresql_options">';
-	print '<legend>Restore PostgreSQL</legend>';
-	print '<div class="formelementrow">';
-	// Parameteres execution
-	$command = $db->getPathOfRestore();
-	if (preg_match("/\s/", $command)) {
-		$command = $command = escapeshellarg($command); // Use quotes on command
+	} elseif (in_array($type, array('pgsql'))) {
+		print '<fieldset id="postgresql_options">';
+		print '<legend>Restore PostgreSQL</legend>';
+		print '<div class="formelementrow">';
+		// Parameteres execution
+		$command = $db->getPathOfRestore();
+		if (preg_match("/\s/", $command)) {
+			$command = $command = escapeshellarg($command); // Use quotes on command
+		}
+
+		$param = " -d ".$dolibarr_main_db_name;
+		$param .= " -h ".$dolibarr_main_db_host;
+		if (!empty($dolibarr_main_db_port)) {
+			$param .= " -p ".$dolibarr_main_db_port;
+		}
+		$param .= " -U ".$dolibarr_main_db_user;
+		$paramcrypted = $param;
+		$paramclear = $param;
+		/*if (!empty($dolibarr_main_db_pass))
+		{
+			$paramcrypted.=" -p".preg_replace('/./i','*',$dolibarr_main_db_pass);
+			$paramclear.=" -p".$dolibarr_main_db_pass;
+		}*/
+		$paramcrypted .= " -W";
+		$paramclear .= " -W";
+		// With psql:
+		$paramcrypted .= " -f";
+		$paramclear .= " -f";
+
+		echo $langs->trans("ImportPostgreSqlDesc");
+		print '<br>';
+		print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportPostgreSqlCommand", $command, ($showpass ? $paramclear : $paramcrypted)).'</textarea><br>';
+		print ajax_autoselect('restorecommand');
+		//if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=postgresql_options">'.$langs->trans("UnHidePassword").'</a>';
+		//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
+		print '</div>';
+
+		print '<br>';
+
+		print '</fieldset>';
 	}
 
-	$param = " -d ".$dolibarr_main_db_name;
-	$param .= " -h ".$dolibarr_main_db_host;
-	if (!empty($dolibarr_main_db_port)) {
-		$param .= " -p ".$dolibarr_main_db_port;
-	}
-	$param .= " -U ".$dolibarr_main_db_user;
-	$paramcrypted = $param;
-	$paramclear = $param;
-	/*if (!empty($dolibarr_main_db_pass))
-	{
-		$paramcrypted.=" -p".preg_replace('/./i','*',$dolibarr_main_db_pass);
-		$paramclear.=" -p".$dolibarr_main_db_pass;
-	}*/
-	$paramcrypted .= " -W";
-	$paramclear .= " -W";
-	// With psql:
-	$paramcrypted .= " -f";
-	$paramclear .= " -f";
-
-	echo $langs->trans("ImportPostgreSqlDesc");
-	print '<br>';
-	print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportPostgreSqlCommand", $command, ($showpass ? $paramclear : $paramcrypted)).'</textarea><br>';
-	print ajax_autoselect('restorecommand');
-	//if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=postgresql_options">'.$langs->trans("UnHidePassword").'</a>';
-	//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
-	print '</div>';
-
-	print '<br>';
-
-	print '</fieldset>';
-}
-
 print '</div>';
 
 
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index a5f571fec0b..a84a6dd7b3e 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -131,7 +131,7 @@ if (!function_exists("session_id")) {
 if (!extension_loaded("mbstring")) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "MBString")."<br>\n";
-	// $checksok = 0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
+// $checksok = 0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "MBString")."<br>\n";
 }
@@ -140,7 +140,7 @@ if (!extension_loaded("mbstring")) {
 if (!extension_loaded("json")) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "JSON")."<br>\n";
-	// $checksok = 0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
+// $checksok = 0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "JSON")."<br>\n";
 }
@@ -149,7 +149,7 @@ if (!extension_loaded("json")) {
 if (!function_exists("imagecreate")) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "GD")."<br>\n";
-	// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
+// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "GD")."<br>\n";
 }
@@ -158,7 +158,7 @@ if (!function_exists("imagecreate")) {
 if (!function_exists("curl_init")) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "Curl")."<br>\n";
-	// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
+// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "Curl")."<br>\n";
 }
@@ -174,7 +174,7 @@ if (!function_exists("easter_date")) {
 if (!function_exists("simplexml_load_string")) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "Xml")."<br>\n";
-	// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
+// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "Xml")."<br>\n";
 }
@@ -183,7 +183,7 @@ if (!function_exists("simplexml_load_string")) {
 if (!function_exists("utf8_encode")) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "UTF8")."<br>\n";
-	// $checksok = 0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
+// $checksok = 0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "UTF8")."<br>\n";
 }
@@ -193,7 +193,7 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 	if (!function_exists("locale_get_primary_language") || !function_exists("locale_get_region")) {
 		$langs->load("errors");
 		print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "Intl")."<br>\n";
-		// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 	} else {
 		print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "Intl")."<br>\n";
 	}
@@ -203,7 +203,7 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 if (!function_exists("imap_open")) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "IMAP")."<br>\n";
-	// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
+// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "IMAP")."<br>\n";
 }
@@ -212,7 +212,7 @@ if (!function_exists("imap_open")) {
 if (!class_exists('ZipArchive')) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "ZIP")."<br>\n";
-	// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
+// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "ZIP")."<br>\n";
 }
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 5a2dcbc0c77..58d3d1d21f2 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -130,7 +130,7 @@ if (!empty($force_install_message)) {
 
 <table class="nobordernopadding<?php if ($force_install_noedit) {
 	print ' hidewhennoedit';
-							   } ?>">
+} ?>">
 
 	<tr>
 		<td colspan="3" class="label">
@@ -189,7 +189,7 @@ if (!empty($force_install_noedit)) {
 				   value="<?php print $dolibarr_main_data_root ?>"
 <?php if (!empty($force_install_noedit)) {
 			print ' disabled';
-} ?>
+		} ?>
 			>
 		</td>
 		<td class="comment"><?php
@@ -221,7 +221,7 @@ if (!empty($force_install_noedit)) {
 				   value="<?php print $dolibarr_main_url_root; ?> "
 <?php if (!empty($force_install_noedit)) {
 		print ' disabled';
-}
+	}
 ?>
 			>
 		</td>
@@ -244,11 +244,11 @@ if (!empty($force_install_noedit)) {
 							   id="main_force_https"
 							   name="main_force_https"
 				<?php if (!empty($force_install_mainforcehttps)) {
-					print ' checked';
-				} ?>
+			print ' checked';
+		} ?>
 				<?php if ($force_install_noedit == 2 && $force_install_mainforcehttps !== null) {
-					print ' disabled';
-				} ?>
+			print ' disabled';
+		} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("CheckToForceHttps"); ?>
@@ -275,8 +275,8 @@ if (!empty($force_install_noedit)) {
 				   name="db_name"
 				   value="<?php echo (!empty($dolibarr_main_db_name)) ? $dolibarr_main_db_name : ($force_install_database ? $force_install_database : 'dolibarr'); ?>"
 				<?php if ($force_install_noedit == 2 && $force_install_database !== null) {
-					print ' disabled';
-				} ?>
+		print ' disabled';
+	} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("DatabaseName"); ?></td>
@@ -388,8 +388,8 @@ if (!empty($force_install_noedit)) {
 			<select id="db_type"
 					name="db_type"
 				<?php if ($force_install_noedit == 2 && $force_install_type !== null) {
-					print ' disabled';
-				} ?>
+			print ' disabled';
+		} ?>
 			>
 				<?php print $option; ?>
 			</select>
@@ -407,8 +407,8 @@ if (!empty($force_install_noedit)) {
 				   name="db_host"
 				   value="<?php print(!empty($force_install_dbserver) ? $force_install_dbserver : (!empty($dolibarr_main_db_host) ? $dolibarr_main_db_host : 'localhost')); ?>"
 				<?php if ($force_install_noedit == 2 && $force_install_dbserver !== null) {
-					print ' disabled';
-				} ?>
+			print ' disabled';
+		} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("ServerAddressDescription"); ?>
@@ -424,8 +424,8 @@ if (!empty($force_install_noedit)) {
 				   id="db_port"
 				   value="<?php print (!empty($force_install_port)) ? $force_install_port : $dolibarr_main_db_port; ?>"
 				<?php if ($force_install_noedit == 2 && $force_install_port !== null) {
-					print ' disabled';
-				} ?>
+			print ' disabled';
+		} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("ServerPortDescription"); ?>
@@ -441,8 +441,8 @@ if (!empty($force_install_noedit)) {
 				   name="db_prefix"
 				   value="<?php echo(!empty($force_install_prefix) ? $force_install_prefix : (!empty($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : 'llx_')); ?>"
 				<?php if ($force_install_noedit == 2 && $force_install_prefix !== null) {
-					print ' disabled';
-				} ?>
+			print ' disabled';
+		} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("DatabasePrefixDescription"); ?></td>
@@ -502,7 +502,7 @@ if (!empty($force_install_noedit)) {
 					?>"
 				<?php if ($force_install_noedit == 2 && $force_install_databasepass !== null) {
 						print ' disabled';
-				} ?>
+					} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("AdminPassword"); ?></td>
@@ -552,8 +552,8 @@ if (!empty($force_install_noedit)) {
 				   class="needroot"
 				   value="<?php print (!empty($force_install_databaserootlogin)) ? $force_install_databaserootlogin : (GETPOSTISSET('db_user_root') ? GETPOST('db_user_root') : (isset($db_user_root) ? $db_user_root : '')); ?>"
 				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootlogin)) {
-					print ' disabled';
-				} ?>
+		print ' disabled';
+	} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("DatabaseRootLoginDescription"); ?>
@@ -593,7 +593,7 @@ if (!empty($force_install_noedit)) {
 					?>"
 				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) {
 						print ' disabled'; /* May be removed by javascript*/
-				} ?>
+					} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("KeepEmptyIfNoPassword"); ?>
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 4ce9551d246..43ce0075f73 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -645,7 +645,7 @@ if (!$error && $db->connected && $action == "set") {
 					$check2 = $newdb->getDefaultCollationDatabase();
 					dolibarr_install_syslog('step1: new database is using charset='.$check1.' collation='.$check2);
 
-					// If values differs, we save conf file again
+				// If values differs, we save conf file again
 					//if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
 					//if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
 				} else {
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index f96d7b8719e..471ea718a41 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3310,7 +3310,7 @@ function migrate_actioncomm_element($db, $langs, $conf)
 			if ($resql) {
 				$db->commit();
 
-				// DDL commands must not be inside a transaction
+			// DDL commands must not be inside a transaction
 				// We will drop at next version because a migrate should be runnable several times if it fails.
 				//$sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."actioncomm DROP COLUMN ".$field;
 				//$db->query($sqlDrop);
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 03171f5be86..12f81cf60e4 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -3137,7 +3137,7 @@ if (is_array($listofmodules) && count($listofmodules) > 0) {
 				$urlpage = $page;
 				if ($i++) {
 					$linktoenabledisable .= ' <a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
-					//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
+				//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
 				} else {
 					if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs)) {
 						$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
@@ -3913,7 +3913,7 @@ if ($module == 'initmodule') {
 						*/
 						print '</datalist>';
 						print '</td>';
-						//} elseif ($key == 'propvalidate') {
+					//} elseif ($key == 'propvalidate') {
 						//	print '<td class="titlefieldcreate">'.$attribute.'</td><td class="valuefieldcreate maxwidth50"><input type="number" step="1" min="0" max="1" class="text maxwidth100" value="'.dol_escape_htmltag(GETPOST($key, 'alpha')).'"></td>';
 					} elseif ($key == 'propvisible') {
 						print '<td class="titlefieldcreate">'.$attribute.'</td><td class="valuefieldcreate"><input class="maxwidth200" type="text" name="'.$key.'" value="'.dol_escape_htmltag(GETPOSTISSET($key) ? GETPOST($key, 'alpha') : "1").'"></td>';
@@ -4933,18 +4933,18 @@ if ($module == 'initmodule') {
 					});
 					</script>';
 
-					/*print '<br>';
-					print '<br>';
-					print '<br>';
-					print '<span class="opacitymedium">'.$langs->trans("or").'</span>';
-					print '<br>';
-					print '<br>';
-					//print '<input type="checkbox" name="initfromtablecheck"> ';
-					print $langs->trans("InitStructureFromExistingTable");
-					print '<input type="text" name="initfromtablename" value="" placeholder="'.$langs->trans("TableName").'">';
-					print '<input type="submit" class="button smallpaddingimp" name="createtablearray" value="'.dol_escape_htmltag($langs->trans("GenerateCode")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
-					print '<br>';
-					*/
+				/*print '<br>';
+				print '<br>';
+				print '<br>';
+				print '<span class="opacitymedium">'.$langs->trans("or").'</span>';
+				print '<br>';
+				print '<br>';
+				//print '<input type="checkbox" name="initfromtablecheck"> ';
+				print $langs->trans("InitStructureFromExistingTable");
+				print '<input type="text" name="initfromtablename" value="" placeholder="'.$langs->trans("TableName").'">';
+				print '<input type="submit" class="button smallpaddingimp" name="createtablearray" value="'.dol_escape_htmltag($langs->trans("GenerateCode")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
+				print '<br>';
+				*/
 				} elseif ($tabdic == 'deletedictionary') {
 					// Delete dic tab
 					print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -5394,7 +5394,7 @@ if ($module == 'initmodule') {
 				});
 				</script>';
 
-				// display permissions for each object
+			// display permissions for each object
 			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 4d9f5a2529d..c4b931c5b15 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1767,7 +1767,7 @@ class Mo extends CommonObject
 			$productstatic->fetch($line->fk_product);
 			$productstatic->load_virtual_stock();
 			$this->tpl['label'] .= $productstatic->getNomUrl(1);
-			//$this->tpl['label'].= ' - '.$productstatic->label;
+		//$this->tpl['label'].= ' - '.$productstatic->label;
 		} else {
 			// If origin MRP line is not a product, but another MRP
 			// TODO
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index ec786f6ce6b..677da44ef65 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -556,7 +556,7 @@ function hash_call($methodName, $nvpStr)
 		$_SESSION['curl_error_no'] = curl_errno($ch);
 		$_SESSION['curl_error_msg'] = curl_error($ch);
 
-		//Execute the Error handling module to display errors.
+	//Execute the Error handling module to display errors.
 	} else {
 		//closing the curl
 		curl_close($ch);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bbec24b64de..269a5298986 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2304,7 +2304,7 @@ class Product extends CommonObject
 					$price_min = price2num($newminprice, 'MU');
 					$price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100));
 					$price_min_ttc = price2num($price_min_ttc, 'MU');
-					//print 'X'.$newminprice.'-'.$price_min;
+				//print 'X'.$newminprice.'-'.$price_min;
 				} else {
 					$price_min = 0;
 					$price_min_ttc = 0;
@@ -2688,7 +2688,7 @@ class Product extends CommonObject
 							$this->multiprices_tva_tx[$i] = $result ? $result["tva_tx"].($result ? ' ('.$result['default_vat_code'].')' : '') : null;
 							$this->multiprices_recuperableonly[$i] = $result ? $result["recuperableonly"] : null;
 
-							// Price by quantity
+						// Price by quantity
 							/*
 							 $this->prices_by_qty[$i]=$result["price_by_qty"];
 							 $this->prices_by_qty_id[$i]=$result["rowid"];
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 255582e62c3..0ccfe522a77 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -199,7 +199,7 @@ class ProductCustomerPrice extends CommonObject
 					$this->price_min = price2num($this->price_min, 'MU');
 					$this->price_min_ttc = price2num($this->price_min) * (1 + ($this->tva_tx / 100));
 					$this->price_min_ttc = price2num($this->price_min_ttc, 'MU');
-					// print 'X'.$newminprice.'-'.$price_min;
+				// print 'X'.$newminprice.'-'.$price_min;
 				} else {
 					$this->price_min = 0;
 					$this->price_min_ttc = 0;
@@ -677,7 +677,7 @@ class ProductCustomerPrice extends CommonObject
 					$this->price_min = price2num($this->price_min, 'MU');
 					$this->price_min_ttc = price2num($this->price_min) * (1 + ($this->tva_tx / 100));
 					$this->price_min_ttc = price2num($this->price_min_ttc, 'MU');
-					// print 'X'.$newminprice.'-'.$price_min;
+				// print 'X'.$newminprice.'-'.$price_min;
 				} else {
 					$this->price_min = 0;
 					$this->price_min_ttc = 0;
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 5a49139386b..f63fb0d5368 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -247,7 +247,7 @@ if ($action == 'createmovements' && $user->hasRight('stock', 'mouvement', 'creer
 						$firstrecord = array_shift($arraybatchinfo);
 						$dlc = $firstrecord['eatby'];
 						$dluo = $firstrecord['sellby'];
-						//var_dump($batch);
+					//var_dump($batch);
 						//var_dump($arraybatchinfo);
 						//var_dump($firstrecord);
 						//var_dump($dlc);
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index c5792768256..09fed415998 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -1356,15 +1356,15 @@ if (!$variants || getDolGlobalString('VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PA
 						<?php
 
 						$productCombination2ValuePairs = $comb2val->fetchByFkCombination($currcomb->id);
-						$iMax = count($productCombination2ValuePairs);
+				$iMax = count($productCombination2ValuePairs);
 
-						for ($i = 0; $i < $iMax; $i++) {
-							echo dol_htmlentities($productCombination2ValuePairs[$i]);
+				for ($i = 0; $i < $iMax; $i++) {
+					echo dol_htmlentities($productCombination2ValuePairs[$i]);
 
-							if ($i !== ($iMax - 1)) {
-								echo ', ';
-							}
-						} ?>
+					if ($i !== ($iMax - 1)) {
+						echo ', ';
+					}
+				} ?>
 					</td>
 					<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 0) ?></td>
 					<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 1) ?></td>
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index d347290c92c..5eb2d929b93 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -839,7 +839,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		if ($usevirtualstock) {
 			// If option to increase/decrease is not on an object validation, virtual stock may differs from physical stock.
 			$stock = $prod->stock_theorique;
-			//TODO $stockwarehouse = $prod->stock_warehouse[$fk_entrepot]->;
+		//TODO $stockwarehouse = $prod->stock_warehouse[$fk_entrepot]->;
 		} else {
 			$stock = $prod->stock_reel;
 			$stockwarehouse = $prod->stock_warehouse[$fk_entrepot]->real;
@@ -891,12 +891,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		$picto = '';
 		if ($ordered > 0) {
 			$stockforcompare = ($usevirtualstock ? $stock : $stock + $ordered);
-			/*if ($stockforcompare >= $desiredstock)
-			{
-			$picto = img_picto('', 'help');
-			} else {
-			$picto = img_picto('', 'help');
-			}*/
+		/*if ($stockforcompare >= $desiredstock)
+		{
+		$picto = img_picto('', 'help');
+		} else {
+		$picto = img_picto('', 'help');
+		}*/
 		} else {
 			$picto = img_picto($langs->trans("NoPendingReceptionOnSupplierOrder"), 'help');
 		}
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index d00755525c4..3cc38f65d28 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -476,7 +476,7 @@ class StockTransferLine extends CommonObjectLine
 					$firstrecord = array_shift($arraybatchinfo);
 					$dlc = $firstrecord['eatby'];
 					$dluo = $firstrecord['sellby'];
-					//var_dump($batch); var_dump($arraybatchinfo); var_dump($firstrecord); var_dump($dlc); var_dump($dluo); exit;
+				//var_dump($batch); var_dump($arraybatchinfo); var_dump($firstrecord); var_dump($dlc); var_dump($dluo); exit;
 				} else {
 					$dlc = '';
 					$dluo = '';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index f1c912f7ea0..c7b875427cd 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -1117,7 +1117,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 				$filter = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
 			}
 			$text = img_picto('', 'company', 'class="pictofixedwidth"');
-			$text .= $form->select_company(!empty($object->thirdparty->id)?$object->thirdparty->id:"", 'socid', $filter, 'None', 1, 0, array(), 0, 'minwidth300');
+			$text .= $form->select_company(!empty($object->thirdparty->id) ? $object->thirdparty->id : "", 'socid', $filter, 'None', 1, 0, array(), 0, 'minwidth300');
 			if (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') && empty($conf->dol_use_jmobile)) {
 				$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 				print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1, 0, '', '', 2);
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 372e3510fcf..620b1127e91 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2494,7 +2494,7 @@ class Project extends CommonObject
 			$return .= '<br>';
 			if ($this->public) {
 				$return .= img_picto($langs->trans('Visibility').': '.$langs->trans('SharedProject'), 'world', 'class="paddingrightonly valignmiddle"');
-				//print $langs->trans('SharedProject');
+			//print $langs->trans('SharedProject');
 			} else {
 				$return .= img_picto($langs->trans('Visibility').': '.$langs->trans('PrivateProject'), 'private', 'class="paddingrightonly valignmiddle"');
 				//print $langs->trans('PrivateProject');
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index d91f9177aa3..93d913f3272 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -297,7 +297,7 @@ if (count($tasksarray) > 0) {
 		if ($val->fk_parent != 0 && $task->hasChildren() > 0) {
 			$tasks[$taskcursor]['task_is_group'] = 1;
 			$tasks[$taskcursor]['task_css'] = 'ggroupblack';
-			//$tasks[$taskcursor]['task_css'] = 'gtaskblue';
+		//$tasks[$taskcursor]['task_css'] = 'gtaskblue';
 		} elseif ($task->hasChildren() > 0) {
 			$tasks[$taskcursor]['task_is_group'] = 1;
 			//$tasks[$taskcursor]['task_is_group'] = 0;
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 1d5a8d85bd8..35302f28ad1 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -1773,7 +1773,7 @@ while ($i < $imaxinloop) {
 			print '<td class="center">';
 			if ($obj->public) {
 				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-				//print $langs->trans('SharedProject');
+			//print $langs->trans('SharedProject');
 			} else {
 				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 				//print $langs->trans('PrivateProject');
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 48e941aae91..a273b7bd381 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -2816,7 +2816,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 					print '<td class="right">' . convertSecondToTime($totalarray['totalduration'], 'allhourmin') . '</td>';
 				} elseif (isset($totalarray['totalvaluefield']) && $totalarray['totalvaluefield'] == $i) {
 					print '<td class="right">' . price($totalarray['totalvalue']) . '</td>';
-					//} elseif ($totalarray['totalvaluebilledfield'] == $i) { print '<td class="center">'.price($totalarray['totalvaluebilled']).'</td>';
+				//} elseif ($totalarray['totalvaluebilledfield'] == $i) { print '<td class="center">'.price($totalarray['totalvaluebilled']).'</td>';
 				} else {
 					print '<td></td>';
 				}
diff --git a/htdocs/public/company/new.php b/htdocs/public/company/new.php
index de5e4d4f179..c011847f9d2 100644
--- a/htdocs/public/company/new.php
+++ b/htdocs/public/company/new.php
@@ -244,7 +244,7 @@ if (empty($reshook) && $action == 'add') {
 					$urlback = $backtopage;
 				} elseif (getDolGlobalString('MEMBER_URL_REDIRECT_SUBSCRIPTION')) {
 					$urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
-					// TODO Make replacement of __AMOUNT__, etc...
+				// TODO Make replacement of __AMOUNT__, etc...
 				} else {
 					$urlback = $_SERVER["PHP_SELF"] . "?action=added&token=" . newToken();
 				}
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 2841a239015..a9b3aa0ae34 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -440,7 +440,7 @@ if (empty($reshook) && $action == 'add') {
 					$urlback = $backtopage;
 				} elseif (getDolGlobalString('MEMBER_URL_REDIRECT_SUBSCRIPTION')) {
 					$urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
-					// TODO Make replacement of __AMOUNT__, etc...
+				// TODO Make replacement of __AMOUNT__, etc...
 				} else {
 					$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
 				}
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index 73c2e3baa17..792bf93f4f7 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -423,7 +423,7 @@ if (empty($reshook) && $action == 'add') {
 					$urlback = $backtopage;
 				} elseif (getDolGlobalString('PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION')) {
 					$urlback = $conf->global->PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION;
-					// TODO Make replacement of __AMOUNT__, etc...
+				// TODO Make replacement of __AMOUNT__, etc...
 				} else {
 					$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
 				}
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index b2dadb42058..e8b76c41645 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -382,7 +382,7 @@ if ($action == 'dopayment') {
 		if (empty($PAYPAL_API_PRICE) || !is_numeric($PAYPAL_API_PRICE)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
 			$action = '';
-			// } elseif (empty($EMAIL)) { $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
+		// } elseif (empty($EMAIL)) { $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
 			// } elseif (! isValidEMail($EMAIL)) { $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
 		} elseif (!$origfulltag) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentCode"));
@@ -2542,29 +2542,29 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 							billing_details: {
 								name: 'test'
 								<?php if (GETPOST('email', 'alpha') || (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->email))) {
-									?>, email: '<?php echo dol_escape_js(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $object->thirdparty->email); ?>'<?php
-								} ?>
+						?>, email: '<?php echo dol_escape_js(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $object->thirdparty->email); ?>'<?php
+					} ?>
 								<?php if (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->phone)) {
-									?>, phone: '<?php echo dol_escape_js($object->thirdparty->phone); ?>'<?php
-								} ?>
+						?>, phone: '<?php echo dol_escape_js($object->thirdparty->phone); ?>'<?php
+					} ?>
 								<?php if (is_object($object) && is_object($object->thirdparty)) {
-									?>, address: {
+						?>, address: {
 									city: '<?php echo dol_escape_js($object->thirdparty->town); ?>',
 									<?php if ($object->thirdparty->country_code) {
-										?>country: '<?php echo dol_escape_js($object->thirdparty->country_code); ?>',<?php
-									} ?>
+							?>country: '<?php echo dol_escape_js($object->thirdparty->country_code); ?>',<?php
+						} ?>
 									line1: '<?php echo dol_escape_js(preg_replace('/\s\s+/', ' ', $object->thirdparty->address)); ?>',
 									postal_code: '<?php echo dol_escape_js($object->thirdparty->zip); ?>'
 									}
 									<?php
-								} ?>
+					} ?>
 							}
 							},
 							save_payment_method:<?php if ($stripecu) {
-								print 'true';
-												} else {
-													print 'false';
-												} ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
+						print 'true';
+					} else {
+						print 'false';
+					} ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
 						},
 					}
 					).then(function(result) {
@@ -2636,29 +2636,29 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 							billing_details: {
 								name: cardholderName.value
 								<?php if (GETPOST('email', 'alpha') || (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->email))) {
-									?>, email: '<?php echo dol_escape_js(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $object->thirdparty->email); ?>'<?php
-								} ?>
+						?>, email: '<?php echo dol_escape_js(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $object->thirdparty->email); ?>'<?php
+					} ?>
 								<?php if (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->phone)) {
-									?>, phone: '<?php echo dol_escape_js($object->thirdparty->phone); ?>'<?php
-								} ?>
+						?>, phone: '<?php echo dol_escape_js($object->thirdparty->phone); ?>'<?php
+					} ?>
 								<?php if (is_object($object) && is_object($object->thirdparty)) {
-									?>, address: {
+						?>, address: {
 									city: '<?php echo dol_escape_js($object->thirdparty->town); ?>',
 									<?php if ($object->thirdparty->country_code) {
-										?>country: '<?php echo dol_escape_js($object->thirdparty->country_code); ?>',<?php
-									} ?>
+							?>country: '<?php echo dol_escape_js($object->thirdparty->country_code); ?>',<?php
+						} ?>
 									line1: '<?php echo dol_escape_js(preg_replace('/\s\s+/', ' ', $object->thirdparty->address)); ?>',
 									postal_code: '<?php echo dol_escape_js($object->thirdparty->zip); ?>'
 									}
 									<?php
-								} ?>
+					} ?>
 							}
 							},
 							save_payment_method:<?php if ($stripecu) {
-								print 'true';
-												} else {
-													print 'false';
-												} ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
+						print 'true';
+					} else {
+						print 'false';
+					} ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
 					}
 					).then(function(result) {
 						console.log(result);
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 1a548dd382f..e1bff57f33d 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -1867,7 +1867,7 @@ if ($ispaymentok) {
 		$result = $mailfile->sendfile();
 		if ($result) {
 			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-			//dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0);
+		//dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0);
 		} else {
 			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			//dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0);
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index 9b35ac796ac..81178c5b087 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -397,7 +397,7 @@ if (empty($reshook) && $action == 'add') {
 					$urlback = $backtopage;
 				} elseif (getDolGlobalString('PROJECT_URL_REDIRECT_LEAD')) {
 					$urlback = $conf->global->PROJECT_URL_REDIRECT_LEAD;
-					// TODO Make replacement of __AMOUNT__, etc...
+				// TODO Make replacement of __AMOUNT__, etc...
 				} else {
 					$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
 				}
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 3b0d17bbf98..6a32b5f4aff 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -89,7 +89,7 @@ if (empty($usedolheader)) {
 		*/
 
 		llxHeader('', '', '', '', 0, 0, $arrayjs, $arraycss);
-}
+	}
 
 
 // CONTENT
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 5d408ebf796..0c486d20303 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -414,7 +414,7 @@ if (empty($reshook)) {
 							$discountid = $discount->create($user);
 							if ($discountid > 0) {
 								$result = $objecttmp->insert_discount($discountid);
-								//$result=$discount->link_to_invoice($lineid,$id);
+							//$result=$discount->link_to_invoice($lineid,$id);
 							} else {
 								setEventMessages($discount->error, $discount->errors, 'errors');
 								$error++;
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index 51a9e3aedc1..d2832f687a9 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -51,8 +51,8 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	<tr class="<?php echo $trclass; ?>">
 		<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("Reception"); ?>
 		<?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
-			print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
-		} ?>
+		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
+	} ?>
 		</td>
 		<td class="linkedcol-name tdoverflowmax150"><?php echo $objectlink->getNomUrl(1); ?></td>
 		<td class="linkedcol-ref tdoverflowmax100" title="<?php echo dol_escape_htmltag($objectlink->ref_supplier); ?>"><?php echo dol_escape_htmltag($objectlink->ref_supplier); ?></td>
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 5542bdd344d..8b1aeca2eb3 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -452,7 +452,7 @@ if ($action == "update_extras" && $permissiontoadd) {
 	if (GETPOSTISSET($attributekeylong.'day') && GETPOSTISSET($attributekeylong.'month') && GETPOSTISSET($attributekeylong.'year')) {
 		// This is properties of a date
 		$object->array_options['options_'.$attributekey] = dol_mktime(GETPOST($attributekeylong.'hour', 'int'), GETPOST($attributekeylong.'min', 'int'), GETPOST($attributekeylong.'sec', 'int'), GETPOST($attributekeylong.'month', 'int'), GETPOST($attributekeylong.'day', 'int'), GETPOST($attributekeylong.'year', 'int'));
-		//var_dump(dol_print_date($object->array_options['options_'.$attributekey]));exit;
+	//var_dump(dol_print_date($object->array_options['options_'.$attributekey]));exit;
 	} else {
 		$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong, 'alpha');
 	}
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 301dbe6dd59..3095e18f2b1 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -391,7 +391,7 @@ foreach ($dirsociete as $dirroot) {
 					dol_syslog($e->getMessage(), LOG_ERR);
 				}
 
-				$modCodeTiers = new $file;
+				$modCodeTiers = new $file();
 
 				// Show modules according to features level
 				if ($modCodeTiers->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
@@ -477,7 +477,7 @@ foreach ($dirsociete as $dirroot) {
 					dol_syslog($e->getMessage(), LOG_ERR);
 				}
 
-				$modCodeCompta = new $file;
+				$modCodeCompta = new $file();
 
 				$arrayofmodules[$file] = $modCodeCompta;
 			}
@@ -593,9 +593,9 @@ foreach ($dirsociete as $dirroot) {
 						print "<td class=\"center\">\n";
 						//if ($conf->global->COMPANY_ADDON_PDF != "$name")
 						//{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&token='.newToken().'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
-							print img_picto($langs->trans("Enabled"), 'switch_on');
-							print '</a>';
+						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&token='.newToken().'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
+						print img_picto($langs->trans("Enabled"), 'switch_on');
+						print '</a>';
 						//}
 						//else
 						//{
@@ -695,9 +695,9 @@ foreach ($profid as $key => $val) {
 		$idprof_mandatory = 'SOCIETE_'.$key.'_MANDATORY';
 		$idprof_invoice_mandatory = 'SOCIETE_'.$key.'_INVOICE_MANDATORY';
 
-		$verif = (empty($conf->global->$idprof_unique) ?false:true);
-		$mandatory = (empty($conf->global->$idprof_mandatory) ?false:true);
-		$invoice_mandatory = (empty($conf->global->$idprof_invoice_mandatory) ?false:true);
+		$verif = (empty($conf->global->$idprof_unique) ? false : true);
+		$mandatory = (empty($conf->global->$idprof_mandatory) ? false : true);
+		$invoice_mandatory = (empty($conf->global->$idprof_invoice_mandatory) ? false : true);
 
 		if ($verif) {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&token='.newToken().'&value='.$key.'&status=0">';
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index a32782fab17..41d5460566e 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('agenda', 'bills', 'companies', 'orders', 'propal'));
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartyagenda';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'thirdpartyagenda';
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
@@ -46,13 +46,13 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -210,9 +210,9 @@ if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') ||
 	$cachekey = 'count_events_thirdparty_'.$object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	if (!empty($conf->dol_optimize_smallscreen)) {
-		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	}
 
 	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index f625b94bed7..19cee63dcb1 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -106,7 +106,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 	$id = (!empty($match[0]) ? $match[0] : '');		// Take first key found into GET array with matching $htmlname123
 
 	// When used from jQuery, the search term is added as GET param "term".
-	$searchkey = (($id && GETPOST($id, 'alpha')) ? GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ?GETPOST($htmlname, 'alpha') : ''));
+	$searchkey = (($id && GETPOST($id, 'alpha')) ? GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ? GETPOST($htmlname, 'alpha') : ''));
 	if (!$searchkey) {
 		return;
 	}
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index b9119174058..b129fde860e 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -203,7 +203,7 @@ abstract class ActionsCardCommon
 						break;
 					}
 				}
-				$modCodeFournisseur = new $module;
+				$modCodeFournisseur = new $module();
 				$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
 				// We verified if the tag prefix is used
 				if ($modCodeFournisseur->code_auto) {
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b280efc4536..cb3ca2527ac 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -110,7 +110,7 @@ if (!empty($backtopagejsfields)) {
 	$dol_openinpopup = $tmpbacktopagejsfields[0];
 }
 
-$socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+$socid = GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -347,8 +347,8 @@ if (empty($reshook)) {
 			$object->idprof5				= trim(GETPOST('idprof5', 'alphanohtml'));
 			$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_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->capital				= GETPOST('capital', 'alphanohtml');
 			$object->barcode				= GETPOST('barcode', 'alphanohtml');
 
@@ -413,7 +413,7 @@ if (empty($reshook)) {
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
 			if ($ret < 0) {
-				 $error++;
+				$error++;
 			}
 
 			// Fill array 'array_languages' with data from add form
@@ -446,7 +446,8 @@ if (empty($reshook)) {
 					}
 					if (!isValidUrl($object->webservices_url)) {
 						$langs->load("errors");
-						$error++; $errors[] = $langs->trans("ErrorBadUrl", $object->webservices_url);
+						$error++;
+						$errors[] = $langs->trans("ErrorBadUrl", $object->webservices_url);
 					}
 				}
 
@@ -837,7 +838,7 @@ if (empty($reshook)) {
 
 	// Actions to build doc
 	$id = $socid;
-	$upload_dir = !empty($conf->societe->multidir_output[$object->entity])?$conf->societe->multidir_output[$object->entity]:$conf->societe->dir_output;
+	$upload_dir = !empty($conf->societe->multidir_output[$object->entity]) ? $conf->societe->multidir_output[$object->entity] : $conf->societe->dir_output;
 	$permissiontoadd = $user->hasRight('societe', 'creer');
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
@@ -915,7 +916,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				break;
 			}
 		}
-		$modCodeClient = new $module;
+		$modCodeClient = new $module();
 		// Load object modCodeFournisseur
 		$module = (getDolGlobalString('SOCIETE_CODECLIENT_ADDON') ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
 		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
@@ -928,7 +929,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				break;
 			}
 		}
-		$modCodeFournisseur = new $module;
+		$modCodeFournisseur = new $module();
 
 		// Define if customer/prospect or supplier status is set or not
 		if (GETPOST("type", 'aZ') != 'f') {
@@ -962,7 +963,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		$object->firstname = GETPOST('firstname', 'alphanohtml');
 		$object->particulier		= $private;
 		$object->prefix_comm		= GETPOST('prefix_comm', 'alphanohtml');
-		$object->client = GETPOST('client', 'int') ?GETPOST('client', 'int') : $object->client;
+		$object->client = GETPOST('client', 'int') ? GETPOST('client', 'int') : $object->client;
 
 		if (empty($duplicate_code_error)) {
 			$object->code_client		= GETPOST('customer_code', 'alpha');
@@ -1037,11 +1038,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 		}
 
-		$object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
+		$object->logo = (isset($_FILES['photo']) ? dol_sanitizeFileName($_FILES['photo']['name']) : '');
 
 		// Company logo management
 		$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
-		$file_OK = (isset($_FILES['photo']) ?is_uploaded_file($_FILES['photo']['tmp_name']) : false);
+		$file_OK = (isset($_FILES['photo']) ? is_uploaded_file($_FILES['photo']['tmp_name']) : false);
 		if ($file_OK) {
 			if (image_format_supported($_FILES['photo']['name'])) {
 				dol_mkdir($dir);
@@ -1061,7 +1062,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		}
 
 		// We set country_id, country_code and country for the selected country
-		$object->country_id = GETPOST('country_id') ?GETPOST('country_id') : $mysoc->country_id;
+		$object->country_id = GETPOST('country_id') ? GETPOST('country_id') : $mysoc->country_id;
 		if ($object->country_id) {
 			$tmparray = getCountry($object->country_id, 'all');
 			$object->country_code = $tmparray['code'];
@@ -1346,7 +1347,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// Prospect/Customer
 			print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
 			print '<td class="maxwidthonsmartphone">';
-			$selected = (GETPOSTISSET('client') ?GETPOST('client', 'int') : $object->client);
+			$selected = (GETPOSTISSET('client') ? GETPOST('client', 'int') : $object->client);
 			print $formcompany->selectProspectCustomerType($selected);
 			print '</td>';
 
@@ -1469,12 +1470,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 			// Phone / Fax
 			print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
-			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone).'"></td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}
 			print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
+			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
 			// Email / Web
 			print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', !getDolGlobalString('SOCIETE_EMAIL_MANDATORY') ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
@@ -1525,10 +1526,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Prof ids
-			$i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
+			$i = 1;
+			$j = 0;
+			$NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
 			while ($i <= 6) {
 				$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-				if ($idprof != '-')	{
+				if ($idprof != '-') {
 					$key = 'idprof'.$i;
 
 					if (($j % $NBCOLS) == 0) {
@@ -1554,7 +1557,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// Vat is used
 			print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
 			print '<td>';
-			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? 'checked="checked"': 'checked="checked"') . ' value="1">'; // Assujeti par defaut en creation
+			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? 'checked="checked"' : 'checked="checked"') . ' value="1">'; // Assujeti par defaut en creation
 			print '</td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
@@ -1566,7 +1569,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			if (!getDolGlobalString('MAIN_DISABLEVATCHECK') && isInEEC($object)) {
 				$s .= ' ';
 
-				if (!empty($conf->use_javascript_ajax))	{
+				if (!empty($conf->use_javascript_ajax)) {
 					$widthpopup = 600;
 					if (!empty($conf->dol_use_jmobile)) {
 						$widthpopup = 350;
@@ -1623,7 +1626,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Type - Workforce/Staff
-			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.( ($conf->browser->layout == 'phone' || getDolGlobalString('SOCIETE_DISABLE_WORKFORCE')) ? ' colspan="3"' : '').'>'."\n";
+			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.(($conf->browser->layout == 'phone' || getDolGlobalString('SOCIETE_DISABLE_WORKFORCE')) ? ' colspan="3"' : '').'>'."\n";
 			$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.
 			print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
 			if ($user->admin) {
@@ -1844,7 +1847,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				$object->address = GETPOST('address', 'alphanohtml');
 				$object->zip = GETPOST('zipcode', 'alphanohtml');
 				$object->town = GETPOST('town', 'alphanohtml');
-				$object->country_id = GETPOST('country_id') ?GETPOST('country_id', 'int') : $mysoc->country_id;
+				$object->country_id = GETPOST('country_id') ? GETPOST('country_id', 'int') : $mysoc->country_id;
 				$object->state_id = GETPOST('state_id', 'int');
 				$object->parent = GETPOST('parent_company_id', 'int');
 
@@ -2165,13 +2168,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '</td></tr>';
 
 				// Zip / Town
-				print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
+				print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
 				print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100');
 				print '</td>';
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
 				}
-				print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
+				print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
 				print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 				print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
 				print '</td></tr>';
@@ -2200,23 +2203,23 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				// Phone / Fax
 				print '<tr><td>'.$form->editfieldkey('Phone', 'phone', GETPOST('phone', 'alpha'), $object, 0).'</td>';
-				print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+				print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone).'"></td>';
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
 				}
 				print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
-				print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
+				print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
 				print '</tr>';
 
 				// Web
 				print '<tr><td>'.$form->editfieldkey('Web', 'url', GETPOST('url', 'alpha'), $object, 0).'</td>';
-				print '<td colspan="3">'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone maxwidth300 widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
+				print '<td colspan="3">'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone maxwidth300 widthcentpercentminusx " value="'.(GETPOSTISSET('url') ? GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
 
 				// EMail
 				print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (getDolGlobalString('SOCIETE_EMAIL_MANDATORY'))).'</td>';
 				print '<td colspan="3">';
 				print img_picto('', 'object_email', 'class="pictofixedwidth"');
-				print '<input type="text" name="email" id="email" class="maxwidth500 widthcentpercentminusx" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'">';
+				print '<input type="text" name="email" id="email" class="maxwidth500 widthcentpercentminusx" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alpha') : $object->email).'">';
 				print '</td></tr>';
 
 				// Unsubscribe
@@ -2290,7 +2293,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				// 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
@@ -2376,7 +2379,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '</tr>';
 
 				// Type - Workforce/Staff
-				print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.( ($conf->browser->layout == 'phone' || getDolGlobalString('SOCIETE_DISABLE_WORKFORCE')) ? ' colspan="3"' : '').'>';
+				print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.(($conf->browser->layout == 'phone' || getDolGlobalString('SOCIETE_DISABLE_WORKFORCE')) ? ' colspan="3"' : '').'>';
 				print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 				if ($user->admin) {
 					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -2422,7 +2425,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				// Incoterms
 				if (isModEnabled('incoterm')) {
 					print '<tr>';
-						print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
+					print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
 					print '<td colspan="3" class="maxwidthonsmartphone">';
 					print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 					print '</td></tr>';
@@ -2686,7 +2689,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Prof ids
-			$i = 1; $j = 0;
+			$i = 1;
+			$j = 0;
 			while ($i <= 6) {
 				$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
 				if ($idprof != '-') {
@@ -3119,7 +3123,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if (empty($user->socid)) {
 					$langs->load("mails");
 					$title = '';
-					if (empty($object->email) && !$at_least_one_email_contact) { $title = $langs->trans('NoEMail'); }
+					if (empty($object->email) && !$at_least_one_email_contact) {
+						$title = $langs->trans('NoEMail');
+					}
 					print dolGetButtonAction($title, $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle', 'btn-send-mail', !empty($object->email) || $at_least_one_email_contact);
 				}
 
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 93a4668cf7c..008d63e8a2d 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -21,7 +21,9 @@
  *		\brief      Popup screen to validate VAT
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');		// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}		// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 
 require "../../main.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -116,7 +118,7 @@ if (!$vatNumber) {
 		}
 		print $langs->trans("VATIntraSyntaxIsValid").': <span class="error">'.$langs->trans("No").'</span> (Might be a non europeen VAT)<br>';
 		print $langs->trans("ValueIsValid").': <span class="error">'.$langs->trans("No").'</span> (Might be a non europeen VAT)<br>';
-		//$messagetoshow=$soapclient->response;
+	//$messagetoshow=$soapclient->response;
 	} else {
 		// Syntaxe ok
 		if ($result['requestDate']) {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 341c3e4124e..b394021caa2 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -896,7 +896,7 @@ class Societe extends CommonObject
 		if (empty($this->status)) {
 			$this->status = 0;
 		}
-		$this->name = $this->name ?trim($this->name) : trim($this->nom);
+		$this->name = $this->name ? trim($this->name) : trim($this->nom);
 		$this->setUpperOrLowerCase();
 		$this->nom = $this->name; // For backward compatibility
 		if (empty($this->client)) {
@@ -1205,8 +1205,11 @@ class Societe extends CommonObject
 		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL', 'TVA_INTRA', 'ACCOUNTANCY_CODE_CUSTOMER', 'ACCOUNTANCY_CODE_SUPPLIER');
 		foreach ($array_to_check as $key) {
 			$keymin = strtolower($key);
-			if ($key == 'ACCOUNTANCY_CODE_CUSTOMER') $keymin = 'code_compta';
-			elseif ($key == 'ACCOUNTANCY_CODE_SUPPLIER') $keymin = 'code_compta_fournisseur';
+			if ($key == 'ACCOUNTANCY_CODE_CUSTOMER') {
+				$keymin = 'code_compta';
+			} elseif ($key == 'ACCOUNTANCY_CODE_SUPPLIER') {
+				$keymin = 'code_compta_fournisseur';
+			}
 			$i = (int) preg_replace('/[^0-9]/', '', $key);
 			$vallabel = $this->$keymin;
 
@@ -1246,7 +1249,8 @@ class Societe extends CommonObject
 					if (!$error && $vallabel && getDolGlobalString('SOCIETE_EMAIL_UNIQUE')) {
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->load("errors");
-							$error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
+							$error++;
+							$this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
 					}
 				} elseif ($key == 'TVA_INTRA') {
@@ -1254,7 +1258,8 @@ class Societe extends CommonObject
 					if ($vallabel && getDolGlobalString('SOCIETE_VAT_INTRA_UNIQUE')) {
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->load("errors");
-							$error++; $this->errors[] = $langs->trans('VATIntra')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
+							$error++;
+							$this->errors[] = $langs->trans('VATIntra')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
 					}
 				} elseif ($key == 'ACCOUNTANCY_CODE_CUSTOMER' && !empty($this->client)) {
@@ -1335,9 +1340,9 @@ class Societe extends CommonObject
 		$this->nom = $this->name; // For backward compatibility
 		$this->name_alias = trim($this->name_alias);
 		$this->ref_ext		= trim($this->ref_ext);
-		$this->address		= $this->address ?trim($this->address) : trim($this->address);
-		$this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
-		$this->town = $this->town ?trim($this->town) : trim($this->town);
+		$this->address		= $this->address ? trim($this->address) : trim($this->address);
+		$this->zip = $this->zip ? trim($this->zip) : trim($this->zip);
+		$this->town = $this->town ? trim($this->town) : trim($this->town);
 		$this->state_id = trim($this->state_id);
 		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim($this->phone);
@@ -1347,15 +1352,15 @@ class Societe extends CommonObject
 		$this->fax			= preg_replace("/\s/", "", $this->fax);
 		$this->fax			= preg_replace("/\./", "", $this->fax);
 		$this->email		= trim($this->email);
-		$this->url			= $this->url ?clean_url($this->url, 0) : '';
+		$this->url			= $this->url ? clean_url($this->url, 0) : '';
 		$this->note_private = trim($this->note_private);
 		$this->note_public  = trim($this->note_public);
 		$this->idprof1		= trim($this->idprof1);
 		$this->idprof2		= trim($this->idprof2);
 		$this->idprof3		= trim($this->idprof3);
 		$this->idprof4		= trim($this->idprof4);
-		$this->idprof5		= (!empty($this->idprof5) ?trim($this->idprof5) : '');
-		$this->idprof6		= (!empty($this->idprof6) ?trim($this->idprof6) : '');
+		$this->idprof5		= (!empty($this->idprof5) ? trim($this->idprof5) : '');
+		$this->idprof6		= (!empty($this->idprof6) ? trim($this->idprof6) : '');
 		$this->prefix_comm = trim($this->prefix_comm);
 		$this->outstanding_limit = price2num($this->outstanding_limit);
 		$this->order_min_amount = price2num($this->order_min_amount);
@@ -1442,7 +1447,7 @@ class Societe extends CommonObject
 		}
 
 		//Web services
-		$this->webservices_url = $this->webservices_url ?clean_url($this->webservices_url, 0) : '';
+		$this->webservices_url = $this->webservices_url ? clean_url($this->webservices_url, 0) : '';
 		$this->webservices_key = trim($this->webservices_key);
 
 		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
@@ -2929,7 +2934,7 @@ class Societe extends CommonObject
 				$label = $langs->trans("ShowCompany");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.' refurl valignmiddle"';
 			$target_value = array('_self', '_blank', '_parent', '_top');
 			if (in_array($target, $target_value)) {
@@ -3121,10 +3126,12 @@ class Societe extends CommonObject
 		if ($resql) {
 			$nump = $this->db->num_rows($resql);
 			if ($nump) {
-				$sepa = "("; $sepb = ")";
+				$sepa = "(";
+				$sepb = ")";
 				if ($mode == 'email') {
 					//$sepa="&lt;"; $sepb="&gt;";
-					$sepa = "<"; $sepb = ">";
+					$sepa = "<";
+					$sepb = ">";
 				}
 				$i = 0;
 				while ($i < $nump) {
@@ -3795,7 +3802,7 @@ class Societe extends CommonObject
 				break;
 		}
 
-		 //Verify duplicate entries
+		//Verify duplicate entries
 		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$this->db->escape($value)."' AND entity IN (".getEntity('societe').")";
 		if ($socid) {
 			$sql .= " AND rowid <> ".$socid;
@@ -4346,7 +4353,7 @@ class Societe extends CommonObject
 
 		if ($member->morphy == 'mor') {
 			if (empty($socname)) {
-				$socname = $member->company? $member->company : $member->societe;
+				$socname = $member->company ? $member->company : $member->societe;
 			}
 			if (!empty($fullname) && empty($socalias)) {
 				$socalias = $fullname;
@@ -4477,7 +4484,8 @@ class Societe extends CommonObject
 
 		//TODO This could be replicated for region but function `getRegion` didn't exist, so I didn't added it.
 		// We define state_id, state_code and state
-		$state_id = 0; $state_code = $state_label = '';
+		$state_id = 0;
+		$state_code = $state_label = '';
 		if (getDolGlobalString('MAIN_INFO_SOCIETE_STATE')) {
 			$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
 			$state_id = $tmp[0];
@@ -4683,7 +4691,7 @@ class Societe extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			return (($obj->nb > 0) ?true:false);
+			return (($obj->nb > 0) ? true : false);
 		} else {
 			$this->error = $this->db->lasterror();
 			return false;
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index e070f07740b..c4efe6be306 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -464,7 +464,7 @@ class SocieteAccount extends CommonObject
 				$label = $langs->trans("WebsiteAccount");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 8cd00ac9cde..9aceb69b6b5 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 $langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));
 
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartylist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'thirdpartylist';
 
 // Security check
 $socid = GETPOST('socid', 'int');
@@ -52,7 +52,7 @@ if ($socid > 0) {
 }
 
 // Sort & Order fields
-$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield 	= GETPOST('sortfield', 'aZ09comma');
 $sortorder 	= GETPOST('sortorder', 'aZ09comma');
 $page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -591,26 +591,26 @@ if ($sql_select) {
 				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
 				}
 				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
 				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
 				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
 					if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) {
 						echo ' ('.dol_print_date($discount->datec).')';
 					}
 				} else {
-					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
+					echo($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
 		} else {
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 2fb0808a36a..612336ea797 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -68,7 +68,7 @@ $action		= (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
 $cancel 	= GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $confirm 	= GETPOST('confirm');
-$socid 		= GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+$socid 		= GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int');
 
 if ($user->socid) {
 	$socid = $user->socid;
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 20666856940..836c8e83294 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -127,7 +127,7 @@ print dol_get_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'co
 
 
 // Build file list
-$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
 $totalsize = 0;
 foreach ($filearray as $key => $file) {
 	$totalsize += $file['size'];
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 9f7bc20008d..cd0573b6457 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -125,16 +125,20 @@ if ($result) {
 	while ($objp = $db->fetch_object($result)) {
 		$found = 0;
 		if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS_STATS') && ($objp->client == 2 || $objp->client == 3)) {
-			$found = 1; $third['prospect']++;
+			$found = 1;
+			$third['prospect']++;
 		}
 		if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS_STATS') && ($objp->client == 1 || $objp->client == 3)) {
-			$found = 1; $third['customer']++;
+			$found = 1;
+			$third['customer']++;
 		}
 		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'))) && !getDolGlobalString('SOCIETE_DISABLE_SUPPLIERS_STATS') && $objp->fournisseur) {
-			$found = 1; $third['supplier']++;
+			$found = 1;
+			$third['supplier']++;
 		}
 		if (isModEnabled('societe') && $objp->client == 0 && $objp->fournisseur == 0) {
-			$found = 1; $third['other']++;
+			$found = 1;
+			$third['other']++;
 		}
 		if ($found) {
 			$total++;
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index a4331d183ed..cda63c586d6 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -131,7 +131,7 @@ $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is
 $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -152,28 +152,32 @@ $pagenext = $page + 1;
 if ($type == 'c') {
 	if (empty($contextpage) || $contextpage == 'thirdpartylist') {
 		$contextpage = 'customerlist';
-	} if ($search_type == '') {
+	}
+	if ($search_type == '') {
 		$search_type = '1,3';
 	}
 }
 if ($type == 'p') {
 	if (empty($contextpage) || $contextpage == 'thirdpartylist') {
 		$contextpage = 'prospectlist';
-	} if ($search_type == '') {
+	}
+	if ($search_type == '') {
 		$search_type = '2,3';
 	}
 }
 if ($type == 't') {
 	if (empty($contextpage) || $contextpage == 'poslist') {
 		$contextpage = 'poslist';
-	} if ($search_type == '') {
+	}
+	if ($search_type == '') {
 		$search_type = '1,2,3';
 	}
 }
 if ($type == 'f') {
 	if (empty($contextpage) || $contextpage == 'thirdpartylist') {
 		$contextpage = 'supplierlist';
-	} if ($search_type == '') {
+	}
+	if ($search_type == '') {
 		$search_type = '4';
 	}
 }
@@ -326,8 +330,7 @@ if ($action == "change") {	// Change customer for TakePOS
 	}
 
 	$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".((int) $idcustomer)." where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
-	$resql = $db->query($sql);
-	?>
+	$resql = $db->query($sql); ?>
 		<script>
 		console.log("Reload page invoice.php with place=<?php print $place; ?>");
 		parent.$("#poslines").load("invoice.php?place=<?php print $place; ?>", function() {
@@ -552,7 +555,7 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."c_stcomm as st ON s.fk_stcomm = st.id";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale == -2) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-	//elseif ($search_sale || (empty($user->rights->societe->client->voir) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->societe->client->readallthirdparties_advance)) && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+//elseif ($search_sale || (empty($user->rights->societe->client->voir) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->societe->client->readallthirdparties_advance)) && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 } elseif (!empty($search_sale) && $search_sale != '-1' || (!$user->hasRight('societe', 'client', 'voir') && !$socid)) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
diff --git a/htdocs/societe/messaging.php b/htdocs/societe/messaging.php
index f09c879f4c8..605a7fd42d8 100644
--- a/htdocs/societe/messaging.php
+++ b/htdocs/societe/messaging.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('agenda', 'bills', 'companies', 'orders', 'propal'));
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartyagenda';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'thirdpartyagenda';
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
@@ -46,13 +46,13 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -208,9 +208,9 @@ if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') ||
 	$cachekey = 'count_events_thirdparty_'.$object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	if (!empty($conf->dol_optimize_smallscreen)) {
-		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	}
 
 	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index cdd50e85c3f..d59ab88ada9 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -37,7 +37,7 @@ $langs->load("companies");
 
 
 // Get parameters
-$id = GETPOST('id') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOST('id') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 0d174f5ad8b..d095ddc258a 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -45,7 +45,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'societe', '', '');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 7a635ad768b..89145d30087 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -707,7 +707,7 @@ if (empty($reshook)) {
 
 			if (empty($newsup)) {
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE fk_soc = ".$object->id." AND service = '".$db->escape($tmpservice)."' AND entity = ".$conf->entity;
-				// TODO Add site and site_account on oauth_token table
+			// TODO Add site and site_account on oauth_token table
 				//$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$db->escape($site_account)."') AND fk_soc = ".((int) $object->id)." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity;
 			} else {
 				try {
@@ -1394,9 +1394,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->sepa_debit->last4;
 					print '</td><td>';
 					if ($src->sepa_debit->country) {
-							$img = picto_from_langcode($src->sepa_debit->country);
-							print $img ? $img.' ' : '';
-							print getCountry($src->sepa_debit->country, 1);
+						$img = picto_from_langcode($src->sepa_debit->country);
+						print $img ? $img.' ' : '';
+						print getCountry($src->sepa_debit->country, 1);
 					} else {
 						print img_warning().' <span class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</span>';
 					}
@@ -1489,7 +1489,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			foreach ($balance->available as $cpt) {
 				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
 				if (!in_array($cpt->currency, $arrayzerounitcurrency)) {
-						$currencybalance[$cpt->currency]['available'] = $cpt->amount / 100;
+					$currencybalance[$cpt->currency]['available'] = $cpt->amount / 100;
 				} else {
 					$currencybalance[$cpt->currency]['available'] = $cpt->amount;
 				}
@@ -1510,7 +1510,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 		if (is_array($currencybalance)) {
 			foreach ($currencybalance as $cpt) {
-				print '<tr><td>'.$langs->trans("Currency".strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'], 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price(isset($cpt->pending)?$cpt->pending:0, 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'] + (isset($cpt->pending)?$cpt->pending:0), 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td></tr>';
+				print '<tr><td>'.$langs->trans("Currency".strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'], 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price(isset($cpt->pending) ? $cpt->pending : 0, 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'] + (isset($cpt->pending) ? $cpt->pending : 0), 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td></tr>';
 			}
 		}
 
@@ -1525,7 +1525,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank');
 
-	$nblocal = 0; $nbremote = 0;
+	$nblocal = 0;
+	$nbremote = 0;
 	$arrayofremoteban = array();
 
 	$rib_list = $object->get_all_rib();
@@ -1839,9 +1840,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print '<td class="center" width="50">';
 			if ((empty($customerstripe->invoice_settings) && $customerstripe->default_source != $src->id) ||
 				(!empty($customerstripe->invoice_settings) && $customerstripe->invoice_settings->default_payment_method != $src->id)) {
-					print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=setassourcedefault&token='.newToken().'">';
-					print img_picto($langs->trans("Default"), 'off');
-					print '</a>';
+				print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=setassourcedefault&token='.newToken().'">';
+				print img_picto($langs->trans("Default"), 'off');
+				print '</a>';
 			} else {
 				print img_picto($langs->trans("Default"), 'on');
 			}
@@ -2061,7 +2062,7 @@ if ($socid && $action == 'edit' && $permissiontoaddupdatepaymentinformation) {
 
 		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
 		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RCUR" => $langs->trans("RECUR"));
-		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur', 'alpha') ?GETPOST('frstrecur', 'alpha') : $companybankaccount->frstrecur), 0);
+		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur', 'alpha') ? GETPOST('frstrecur', 'alpha') : $companybankaccount->frstrecur), 0);
 		print '</td></tr>';
 
 		print '<tr><td>'.$langs->trans("ExternalSystemID")." ('pm_...' or 'src_...')</td>";
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 4131f2f7047..e411764ec3f 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -55,7 +55,7 @@ $search_price 	= GETPOST('search_price');
 $search_price_ttc = GETPOST('search_price_ttc');
 
 // Security check
-$socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+$socid = GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -109,7 +109,10 @@ if (empty($reshook)) {
 			$vatratecode = '';
 			$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
 			$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-			$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+			$localtax1 = 0;
+			$localtax2 = 0;
+			$localtax1_type = '0';
+			$localtax2_type = '0';
 			// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
 			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) {
 				// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
@@ -261,7 +264,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 	if (empty($page) || $page == -1) {
 		$page = 0;
@@ -276,7 +279,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 		$sortfield = "soc.nom";
 	}
 
-		// Build filter to display only concerned lines
+	// Build filter to display only concerned lines
 	$filter = array(
 		't.fk_soc' => $object->id
 	);
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 2ebbb52b2ad..677fce1b7ca 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -38,12 +38,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 $langs->loadLangs(array('companies', 'orders'));
 
 // Get parameters
-$id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -270,9 +270,9 @@ if ($id > 0 || !empty($ref)) {
 
 						// Lastname
 						print "<td><a href=\"card.php?rowid=$objp->rowid\">";
-						print ((!empty($objp->lastname) || !empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
-						print (((!empty($objp->lastname) || !empty($objp->firstname)) && !empty($companyname)) ? ' / ' : '');
-						print (!empty($companyname) ? dol_trunc($companyname, 32) : '');
+						print((!empty($objp->lastname) || !empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
+						print(((!empty($objp->lastname) || !empty($objp->firstname)) && !empty($companyname)) ? ' / ' : '');
+						print(!empty($companyname) ? dol_trunc($companyname, 32) : '');
 						print "</a></td>\n";
 
 						// Login
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index cc22d1abc05..67192c08357 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -45,16 +45,16 @@ $langs->loadLangs(array("companies", "website"));
 // Get parameters
 $id = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
 
-$action 	 = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';               // The action 'add', 'create', 'edit', 'update', 'view', ...
+$action 	 = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view';               // The action 'add', 'create', 'edit', 'update', 'view', ...
 $show_files  = GETPOST('show_files', 'int');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'websitelist';  // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'websitelist';  // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha');                                              // Go back to a dedicated page
 $optioncss   = GETPOST('optioncss', 'aZ');                                                  // Option for the css output (always '' except when 'print')
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -123,7 +123,7 @@ if ($id > 0) {
 }
 
 // Security check
-$id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
 if ($user->socid) {
 	$id = $user->socid;
 }
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 0d6f2db0d43..d39e6b9a91d 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -755,57 +755,57 @@ if ($action == 'create' || $action == 'presend') {
 	$formticket->withcancel = 1;
 
 	$formticket->showForm(1, 'create', 0, null, $action);
-	/*} elseif ($action == 'edit' && $user->rights->ticket->write && $object->status < Ticket::STATUS_CLOSED) {
-	$formticket = new FormTicket($db);
+/*} elseif ($action == 'edit' && $user->rights->ticket->write && $object->status < Ticket::STATUS_CLOSED) {
+$formticket = new FormTicket($db);
 
-	$head = ticket_prepare_head($object);
+$head = ticket_prepare_head($object);
 
-	print '<form method="POST" name="form_ticket" id="form_edit_ticket" action="'.$_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="tack_id" value="'.$object->track_id.'">';
+print '<form method="POST" name="form_ticket" id="form_edit_ticket" action="'.$_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="tack_id" value="'.$object->track_id.'">';
 
-	print dol_get_fiche_head($head, 'card', $langs->trans('Ticket'), 0, 'ticket');
+print dol_get_fiche_head($head, 'card', $langs->trans('Ticket'), 0, 'ticket');
 
-	print '<div class="fichecenter2">';
-	print '<table class="border" width="100%">';
+print '<div class="fichecenter2">';
+print '<table class="border" width="100%">';
 
-	// Type
-	print '<tr><td class="titlefield"><span class="fieldrequired"><label for="selecttype_code">'.$langs->trans("TicketTypeRequest").'</span></label></td><td>';
-	$formticket->selectTypesTickets((GETPOSTISSET('type_code') ? GETPOST('type_code') : $object->type_code), 'type_code', '', '2');
-	print '</td></tr>';
+// Type
+print '<tr><td class="titlefield"><span class="fieldrequired"><label for="selecttype_code">'.$langs->trans("TicketTypeRequest").'</span></label></td><td>';
+$formticket->selectTypesTickets((GETPOSTISSET('type_code') ? GETPOST('type_code') : $object->type_code), 'type_code', '', '2');
+print '</td></tr>';
 
-	// Severity
-	print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
-	$formticket->selectSeveritiesTickets((GETPOSTISSET('severity_code') ? GETPOST('severity_code') : $object->severity_code), 'severity_code', '', '2');
-	print '</td></tr>';
+// Severity
+print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
+$formticket->selectSeveritiesTickets((GETPOSTISSET('severity_code') ? GETPOST('severity_code') : $object->severity_code), 'severity_code', '', '2');
+print '</td></tr>';
 
-	// Group
-	print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">'.$langs->trans("TicketCategory").'</span></label></td><td>';
-	$formticket->selectGroupTickets((GETPOSTISSET('category_code') ? GETPOST('category_code') : $object->category_code), 'category_code', '', '2');
-	print '</td></tr>';
+// Group
+print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">'.$langs->trans("TicketCategory").'</span></label></td><td>';
+$formticket->selectGroupTickets((GETPOSTISSET('category_code') ? GETPOST('category_code') : $object->category_code), 'category_code', '', '2');
+print '</td></tr>';
 
-	// Subject
-	print '<tr><td><label for="subject"><span class="fieldrequired">'.$langs->trans("Subject").'</span></label></td><td>';
-	print '<input class="text minwidth200" id="subject" name="subject" value="'.dol_escape_htmltag(GETPOSTISSET('subject') ? GETPOST('subject', 'alpha') : $object->subject).'" />';
-	print '</td></tr>';
+// Subject
+print '<tr><td><label for="subject"><span class="fieldrequired">'.$langs->trans("Subject").'</span></label></td><td>';
+print '<input class="text minwidth200" id="subject" name="subject" value="'.dol_escape_htmltag(GETPOSTISSET('subject') ? GETPOST('subject', 'alpha') : $object->subject).'" />';
+print '</td></tr>';
 
-	// Other attributes
-	$parameters = array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	if (empty($reshook)) {
-	print $object->showOptionals($extrafields, 'edit');
-	}
+// Other attributes
+$parameters = array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
+$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (empty($reshook)) {
+print $object->showOptionals($extrafields, 'edit');
+}
 
-	print '</table>';
-	print '</div>';
+print '</table>';
+print '</div>';
 
-	print dol_get_fiche_end();
+print dol_get_fiche_end();
 
-	print $form->buttonsSaveCancel();
+print $form->buttonsSaveCancel();
 
-	print '</form>'; */
+print '</form>'; */
 } elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'presend' || $action == 'presend_addmessage' || $action == 'close' || $action == 'abandon' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'categories' || $action == 'reopen'
 	|| $action== 'edit_contrat' || $action == 'editsubject' || $action == 'edit_extras' || $action == 'update_extras' || $action == 'edit_extrafields' || $action == 'set_extrafields' || $action == 'classify' || $action == 'sel_contract' || $action == 'edit_message_init' || $action == 'set_status' || $action == 'dellink') {
 	if ($res > 0) {
diff --git a/htdocs/ticket/tpl/linkedobjectblock.tpl.php b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
index e4ccd67308c..359a20fb0d6 100644
--- a/htdocs/ticket/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
@@ -47,8 +47,8 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	<tr class="<?php echo $trclass; ?>" >
 		<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("Ticket"); ?>
 		<?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
-			print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
-		} ?>
+		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
+	} ?>
 		</td>
 		<td class="linkedcol-name tdoverflowmax150"><?php echo $objectlink->getNomUrl(1); ?></td>
 		<td class="linkedcol-ref center"><?php echo $objectlink->ref_client; ?></td>
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 05826f80dbc..092e7752da5 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2321,7 +2321,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<td>'.$form->editfieldkey('Employee', 'employee', '', $object, 0).'</td><td>';
 			if ($caneditfield) {
 				print '<input type="checkbox" name="employee" value="1"'.($object->employee ? ' checked="checked"' : '').'>';
-				//print $form->selectyesno("employee", $object->employee, 1);
+			//print $form->selectyesno("employee", $object->employee, 1);
 			} else {
 				print '<input type="checkbox" name="employee" disabled value="1"'.($object->employee ? ' checked="checked"' : '').'>';
 				/*if ($object->employee) {
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index e7913c9750c..c35390a4953 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -518,7 +518,7 @@ if (!empty($id) || !empty($ref)) {
 				$listofvariantselected .= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 			}
 			$listofvariantselected .= '</div>';
-			//print dol_get_fiche_end();
+		//print dol_get_fiche_end();
 		} else {
 			$title = $langs->trans('EditProductCombination');
 		}
@@ -654,12 +654,12 @@ if (!empty($id) || !empty($ref)) {
 					</select>
 					<?php
 					$htmltext = $langs->trans("GoOnMenuToCreateVairants", $langs->transnoentities("Product"), $langs->transnoentities("VariantAttributes"));
-					print $form->textwithpicto('', $htmltext);
-					/*
-					print ' &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/variants/create.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=add&token='.newToken().'&id='.$object->id).'">';
-					print $langs->trans("Create");
-					print '</a>';
-					*/ ?>
+			print $form->textwithpicto('', $htmltext);
+			/*
+			print ' &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/variants/create.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=add&token='.newToken().'&id='.$object->id).'">';
+			print $langs->trans("Create");
+			print '</a>';
+			*/ ?>
 				</td>
 			</tr>
 			<tr>
@@ -778,7 +778,7 @@ if (!empty($id) || !empty($ref)) {
 		<div style="text-align: center">
 		<input type="submit" name="create" <?php if (!is_array($productCombination2ValuePairs1)) {
 			print ' disabled="disabled"';
-										   } ?> value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans("Save") ?>" class="button button-save">
+		} ?> value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans("Save") ?>" class="button button-save">
 		&nbsp;
 		<input type="submit" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>" class="button button-cancel">
 		</div>
diff --git a/htdocs/variants/tpl/productattributevalueline_create.tpl.php b/htdocs/variants/tpl/productattributevalueline_create.tpl.php
index 7eeee0636cd..afa6e34acef 100644
--- a/htdocs/variants/tpl/productattributevalueline_create.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_create.tpl.php
@@ -53,8 +53,8 @@ $nolinesbefore = (count($this->lines) == 0 || $forcetoshowtitlelines);
 	?>
 	<td class="nobottom linecolref">
 		<?php $coldisplay++; if ($nolinesbefore) {
-			echo $langs->trans('Ref') . ': ';
-		} ?>
+		echo $langs->trans('Ref') . ': ';
+	} ?>
 		<input type="text" name="line_ref" id="line_ref" class="flat" value="<?php echo(GETPOSTISSET("line_ref") ? GETPOST("line_ref", 'alpha', 2) : ''); ?>" autofocus>
 		<?php
 		if (is_object($hookmanager)) {
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index aa7ea1f78e7..4ba2048c6c4 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -5140,22 +5140,22 @@ if ((empty($action) || $action == 'preview' || $action == 'createfromclone' || $
 
 		print $out;
 
-		/*file_put_contents($filetpl, $out);
-		dolChmod($filetpl);
+	/*file_put_contents($filetpl, $out);
+	dolChmod($filetpl);
 
-		// Output file on browser
-		dol_syslog("index.php include $filetpl $filename content-type=$type");
-		$original_file_osencoded=dol_osencode($filetpl);    // New file name encoded in OS encoding charset
+	// Output file on browser
+	dol_syslog("index.php include $filetpl $filename content-type=$type");
+	$original_file_osencoded=dol_osencode($filetpl);    // New file name encoded in OS encoding charset
 
-		// This test if file exists should be useless. We keep it to find bug more easily
-		if (! file_exists($original_file_osencoded))
-		{
-		dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
-		exit;
-		}
+	// This test if file exists should be useless. We keep it to find bug more easily
+	if (! file_exists($original_file_osencoded))
+	{
+	dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
+	exit;
+	}
 
-		//include_once $original_file_osencoded;
-		*/
+	//include_once $original_file_osencoded;
+	*/
 
 		/*print '<iframe class="websiteiframenoborder centpercent" src="'.DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$pageid.'"/>';
 		print '</iframe>';*/