Dolibarr / dolibarr

htdocs/core/lib/functions.lib.php

Braces +1692 added lines, -594 removed lines

@@ -87,7 +87,9 @@ 
 	} else {
 		$out = '';
 		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
-		if (in_array($element, $addzero)) $out .= '0,';
+		if (in_array($element, $addzero)) {
+			$out .= '0,';
+		}
 		$out .= $conf->entity;
 		return $out;
 	}
@@ -216,7 +218,9 @@ 
 
 	$relativepathstring = $_SERVER["PHP_SELF"];
 	// Clean $relativepathstring
-	if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+	if (constant('DOL_URL_ROOT')) {
+		$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+	}
 	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 	//var_dump($relativepathstring);
@@ -224,18 +228,22 @@ 
 
 	// Code for search criteria persistence.
 	// Retrieve values if restore_lastsearch_values
-	if (!empty($_GET['restore_lastsearch_values']))        // Use $_GET here and not GETPOST
+	if (!empty($_GET['restore_lastsearch_values'])) {
+		// Use $_GET here and not GETPOST
 	{
 		if (!empty($_SESSION['lastsearch_values_'.$relativepathstring]))	// If there is saved values
 		{
 			$tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
+	}
 			if (is_array($tmp))
 			{
 				foreach ($tmp as $key => $val)
 				{
-					if ($key == $paramname)	// We are on the requested parameter
+					if ($key == $paramname) {
+						// We are on the requested parameter
 					{
 						$isset = 1;
+					}
 						break;
 					}
 				}
@@ -288,7 +296,9 @@ 
 {
 	global $mysoc, $user, $conf;
 
-	if (empty($paramname)) return 'BadFirstParameterForGETPOST';
+	if (empty($paramname)) {
+		return 'BadFirstParameterForGETPOST';
+	}
 	if (empty($check))
 	{
 		dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);
@@ -296,17 +306,25 @@ 
 		//var_dump(debug_backtrace()[0]);
 	}
 
-	if (empty($method)) $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
-	elseif ($method == 1) $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
-	elseif ($method == 2) $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
-	elseif ($method == 3) $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
-	else return 'BadThirdParameterForGETPOST';
+	if (empty($method)) {
+		$out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+	} elseif ($method == 1) {
+		$out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+	} elseif ($method == 2) {
+		$out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+	} elseif ($method == 3) {
+		$out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+	} else {
+		return 'BadThirdParameterForGETPOST';
+	}
 
 	if (empty($method) || $method == 3 || $method == 4)
 	{
 		$relativepathstring = $_SERVER["PHP_SELF"];
 		// Clean $relativepathstring
-		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+		if (constant('DOL_URL_ROOT')) {
+			$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+		}
 		$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 		$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 		//var_dump($relativepathstring);
@@ -314,18 +332,22 @@ 
 
 		// Code for search criteria persistence.
 		// Retrieve values if restore_lastsearch_values
-		if (!empty($_GET['restore_lastsearch_values']))        // Use $_GET here and not GETPOST
+		if (!empty($_GET['restore_lastsearch_values'])) {
+			// Use $_GET here and not GETPOST
 		{
 			if (!empty($_SESSION['lastsearch_values_'.$relativepathstring]))	// If there is saved values
 			{
 				$tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
+		}
 				if (is_array($tmp))
 				{
 					foreach ($tmp as $key => $val)
 					{
-						if ($key == $paramname)	// We are on the requested parameter
+						if ($key == $paramname) {
+							// We are on the requested parameter
 						{
 							$out = $val;
+						}
 							break;
 						}
 					}
@@ -343,12 +365,14 @@ 
 				$out = $_SESSION['lastsearch_limit_'.$relativepathstring];
 			}
 		} // Else, retreive default values if we are not doing a sort
-		elseif (!isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
+		elseif (!isset($_GET['sortfield'])) {
+			// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 		{
 			if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 			{
 				// Search default value from $object->field
 				global $object;
+		}
 				if (is_object($object) && isset($object->fields[$paramname]['default']))
 				{
 					$out = $object->fields[$paramname]['default'];
@@ -359,13 +383,15 @@ 
 			    if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 				{
 					// Now search in setup to overwrite default values
-					if (!empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
+					if (!empty($user->default_values)) {
+						// $user->default_values defined from menu 'Setup - Default values'
 					{
 						if (isset($user->default_values[$relativepathstring]['createform']))
 						{
 							foreach ($user->default_values[$relativepathstring]['createform'] as $defkey => $defval)
 							{
 								$qualified = 0;
+					}
 								if ($defkey != '_noquery_')
 								{
 									$tmpqueryarraytohave = explode('&', $defkey);
@@ -373,11 +399,17 @@ 
 									$foundintru = 0;
 									foreach ($tmpqueryarraytohave as $tmpquerytohave)
 									{
-										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;
+										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+											$foundintru = 1;
+										}
+									}
+									if (!$foundintru) {
+										$qualified = 1;
 									}
-									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
-								} else $qualified = 1;
+								} else {
+									$qualified = 1;
+								}
 
 								if ($qualified)
 								{
@@ -395,7 +427,8 @@ 
 				//elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 				elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 				{
-					if (!empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
+					if (!empty($user->default_values)) {
+						// $user->default_values defined from menu 'Setup - Default values'
 					{
 						//var_dump($user->default_values[$relativepathstring]);
 						if ($paramname == 'sortfield' || $paramname == 'sortorder')			// Sorted on which fields ? ASC or DESC ?
@@ -405,6 +438,7 @@ 
 								foreach ($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval)
 								{
 									$qualified = 0;
+					}
 									if ($defkey != '_noquery_')
 									{
 										$tmpqueryarraytohave = explode('&', $defkey);
@@ -412,18 +446,26 @@ 
 										$foundintru = 0;
 										foreach ($tmpqueryarraytohave as $tmpquerytohave)
 										{
-											if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;
+											if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+												$foundintru = 1;
+											}
+										}
+										if (!$foundintru) {
+											$qualified = 1;
 										}
-										if (!$foundintru) $qualified = 1;
 										//var_dump($defkey.'-'.$qualified);
-									} else $qualified = 1;
+									} else {
+										$qualified = 1;
+									}
 
 									if ($qualified)
 									{
 										$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 										foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val)
 										{
-											if ($out) $out .= ', ';
+											if ($out) {
+												$out .= ', ';
+											}
 											if ($paramname == 'sortfield')
 											{
 												$out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace);
@@ -439,9 +481,11 @@ 
 							}
 						} elseif (isset($user->default_values[$relativepathstring]['filters']))
 						{
-							foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)	// $defkey is a querystring like 'a=b&c=d', $defval is key of user
+							foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval) {
+								// $defkey is a querystring like 'a=b&c=d', $defval is key of user
 							{
 								$qualified = 0;
+							}
 								if ($defkey != '_noquery_')
 								{
 									$tmpqueryarraytohave = explode('&', $defkey);
@@ -449,11 +493,17 @@ 
 									$foundintru = 0;
 									foreach ($tmpqueryarraytohave as $tmpquerytohave)
 									{
-										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;
+										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+											$foundintru = 1;
+										}
+									}
+									if (!$foundintru) {
+										$qualified = 1;
 									}
-									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
-								} else $qualified = 1;
+								} else {
+									$qualified = 1;
+								}
 
 								if ($qualified)
 								{
@@ -486,9 +536,12 @@ 
 	{
 		$reg = array();
 		$maxloop = 20; $loopnb = 0; // Protection against infinite loop
-		while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
+		while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) {
+			// Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
 		{
-			$loopnb++; $newout = '';
+			$loopnb++;
+		}
+		$newout = '';
 
 			if ($reg[1] == 'DAY') {
 				$tmp = dol_getdate(dol_now(), true);
@@ -546,7 +599,9 @@ 
 			if (!is_numeric($out)) { $out = ''; }
 			break;
 		case 'intcomma':
-			if (preg_match('/[^0-9,-]+/i', $out)) $out = '';
+			if (preg_match('/[^0-9,-]+/i', $out)) {
+				$out = '';
+			}
 			break;
 		case 'alpha':
 			if (!is_array($out)) {
@@ -562,25 +617,33 @@ 
 			if (!is_array($out))
 			{
 				$out = trim($out);
-				if (preg_match('/[^a-z]+/i', $out)) $out = '';
+				if (preg_match('/[^a-z]+/i', $out)) {
+					$out = '';
+				}
 			}
 			break;
 		case 'aZ09':
 			if (!is_array($out))
 			{
 				$out = trim($out);
-				if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) $out = '';
+				if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) {
+					$out = '';
+				}
 			}
 			break;
 		case 'aZ09comma':		// great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh
 			if (!is_array($out))
 			{
 				$out = trim($out);
-				if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) $out = '';
+				if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) {
+					$out = '';
+				}
 			}
 			break;
 		case 'array':
-			if (!is_array($out) || empty($out)) $out = array();
+			if (!is_array($out) || empty($out)) {
+				$out = array();
+			}
 			break;
 		case 'nohtml':
 			$out = dol_string_nohtmltag($out, 0);
@@ -598,7 +661,9 @@ 
 			$out = dol_string_onlythesehtmltags($out, 0);
 			break;
 		case 'custom':
-			if (empty($filter)) return 'BadFourthParameterForGETPOST';
+			if (empty($filter)) {
+				return 'BadFourthParameterForGETPOST';
+			}
 			$out = filter_var($out, $filter, $options);
 			break;
 	}
@@ -615,10 +680,12 @@ 
 			// - posted value not empty, or
 			// - if posted value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
 
-			if ($out != '')		// $out = '0' or 'abc', it is a search criteria to keep
+			if ($out != '') {
+				// $out = '0' or 'abc', it is a search criteria to keep
 			{
 				$user->lastsearch_values_tmp[$relativepathstring][$paramname] = $out;
 			}
+			}
 		}
 	}
 
@@ -643,21 +710,28 @@ 
 		// If prefix is for email
 		if ($mode == 'email')
 		{
-		    if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
+		    if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) {
+		    	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
 			{
 				if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
-				elseif (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
+		    } elseif (isset($_SERVER["SERVER_NAME"])) {
+					return $_SERVER["SERVER_NAME"];
+				}
 			}
 
 			// The recommended value (may be not defined for old versions)
-			if (!empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id;
+			if (!empty($conf->file->instance_unique_id)) {
+				return $conf->file->instance_unique_id;
+			}
 
 			// For backward compatibility
 			return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');
 		}
 
 		// The recommended value (may be not defined for old versions)
-		if (!empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id;
+		if (!empty($conf->file->instance_unique_id)) {
+			return $conf->file->instance_unique_id;
+		}
 
 		// For backward compatibility
 		if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
@@ -714,16 +788,21 @@ 
 
 	$path = preg_replace('/^\//', '', $path);
 
-	if (empty($type))	// For a filesystem path
+	if (empty($type)) {
+		// For a filesystem path
 	{
-		$res = DOL_DOCUMENT_ROOT.'/'.$path; // Standard default path
+		$res = DOL_DOCUMENT_ROOT.'/'.$path;
+	}
+	// Standard default path
 		if (is_array($conf->file->dol_document_root))
 		{
-			foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array("main"=>"/home/main/htdocs", "alt0"=>"/home/dirmod/htdocs", ...)
+			foreach ($conf->file->dol_document_root as $key => $dirroot) {
+				// ex: array("main"=>"/home/main/htdocs", "alt0"=>"/home/dirmod/htdocs", ...)
 			{
 				if ($key == 'main')
 				{
 					continue;
+			}
 				}
 				if (file_exists($dirroot.'/'.$path))
 				{
@@ -732,10 +811,12 @@ 
 				}
 			}
 		}
-		if ($returnemptyifnotfound)								// Not found into alternate dir
+		if ($returnemptyifnotfound) {
+			// Not found into alternate dir
 		{
 			if ($returnemptyifnotfound == 1 || !file_exists($res)) return '';
 		}
+		}
 	} else // For an url path
 	{
 		// We try to get local path of file on filesystem from url
@@ -743,17 +824,27 @@ 
 		// works only for some web server and some setup. This is bugged when
 		// using proxy, rewriting, virtual path, etc...
 		$res = '';
-		if ($type == 1) $res = DOL_URL_ROOT.'/'.$path; // Standard value
-		if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path; // Standard value
-		if ($type == 3) $res = DOL_URL_ROOT.'/'.$path;
+		if ($type == 1) {
+			$res = DOL_URL_ROOT.'/'.$path;
+		}
+		// Standard value
+		if ($type == 2) {
+			$res = DOL_MAIN_URL_ROOT.'/'.$path;
+		}
+		// Standard value
+		if ($type == 3) {
+			$res = DOL_URL_ROOT.'/'.$path;
+		}
 
-		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
+		foreach ($conf->file->dol_document_root as $key => $dirroot) {
+			// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
 		{
 			if ($key == 'main')
 			{
 				if ($type == 3)
 				{
 					global $dolibarr_main_url_root;
+		}
 
 					// Define $urlwithroot
 					$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -832,10 +923,15 @@ 
 function dol_size($size, $type = '')
 {
 	global $conf;
-	if (empty($conf->dol_optimize_smallscreen)) return $size;
-	if ($type == 'width' && $size > 250) return 250;
-	else return 10;
-}
+	if (empty($conf->dol_optimize_smallscreen)) {
+		return $size;
+	}
+	if ($type == 'width' && $size > 250) {
+		return 250;
+	} else {
+		return 10;
+	}
+	}
 
 
 /**
@@ -941,7 +1037,9 @@ 
 {
 	$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°'); // more complete than dol_sanitizeFileName
 	$forbidden_chars_to_remove = array();
-	if (is_array($badcharstoreplace)) $forbidden_chars_to_replace = $badcharstoreplace;
+	if (is_array($badcharstoreplace)) {
+		$forbidden_chars_to_replace = $badcharstoreplace;
+	}
 	//$forbidden_chars_to_remove=array("(",")");
 
 	return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));
@@ -962,8 +1060,9 @@ 
 	$substitjs = array("&#039;"=>"\\'", "\r"=>'\\r');
 	//$substitjs['</']='<\/';	// We removed this. Should be useless.
 	if (empty($noescapebackslashn)) { $substitjs["\n"] = '\\n'; $substitjs['\\'] = '\\\\'; }
-	if (empty($mode)) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\'"; } elseif ($mode == 1) $substitjs["'"] = "\\'";
-	elseif ($mode == 2) { $substitjs['"'] = '\\"'; } elseif ($mode == 3) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\\""; }
+	if (empty($mode)) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\'"; } elseif ($mode == 1) {
+		$substitjs["'"] = "\\'";
+	} elseif ($mode == 2) { $substitjs['"'] = '\\"'; } elseif ($mode == 3) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\\""; }
 	return strtr($stringtoescape, $substitjs);
 }
 
@@ -991,7 +1090,9 @@ 
  */
 function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $keepmoretags = '', $escapeonlyhtmltags = 0)
 {
-	if ($keepmoretags == 'common') $keepmoretags = 'html,body,a,em,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';
+	if ($keepmoretags == 'common') {
+		$keepmoretags = 'html,body,a,em,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';
+	}
 	// TODO Implement $keepmoretags
 
 	// escape quotes and backslashes, newlines, etc.
@@ -1000,8 +1101,12 @@ 
 	} else {
 		$tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');
 	}
-	if (!$keepb) $tmp = strtr($tmp, array("<b>"=>'', '</b>'=>''));
-	if (!$keepn) $tmp = strtr($tmp, array("\r"=>'\\r', "\n"=>'\\n'));
+	if (!$keepb) {
+		$tmp = strtr($tmp, array("<b>"=>'', '</b>'=>''));
+	}
+	if (!$keepn) {
+		$tmp = strtr($tmp, array("\r"=>'\\r', "\n"=>'\\n'));
+	}
 	if ($escapeonlyhtmltags) {
 		return htmlspecialchars($tmp, ENT_COMPAT, 'UTF-8');
 	} else {
@@ -1059,13 +1164,18 @@ 
     global $conf, $user, $debugbar;
 
 	// If syslog module enabled
-	if (empty($conf->syslog->enabled)) return;
+	if (empty($conf->syslog->enabled)) {
+		return;
+	}
 
 	// Check if we are into execution of code of a website
 	if (defined('USEEXTERNALSERVER') && ! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
 		global $website, $websitekey;
-		if (is_object($website) && ! empty($website->ref)) $suffixinfilename.='_website_'.$website->ref;
-		elseif (! empty($websitekey)) $suffixinfilename.='_website_'.$websitekey;
+		if (is_object($website) && ! empty($website->ref)) {
+			$suffixinfilename.='_website_'.$website->ref;
+		} elseif (! empty($websitekey)) {
+			$suffixinfilename.='_website_'.$websitekey;
+		}
 	}
 
 	if ($ident < 0)
@@ -1084,7 +1194,9 @@ 
 		{
 			throw new Exception('Incorrect log level');
 		}
-		if ($level > $conf->global->SYSLOG_LEVEL) return;
+		if ($level > $conf->global->SYSLOG_LEVEL) {
+			return;
+		}
 
 		$message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log
 
@@ -1116,18 +1228,29 @@ 
 		if (!empty($remoteip)) {
 			$data['ip'] = $remoteip;
 			// This is when server run behind a reverse proxy
-			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != $remoteip) $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].' -> '.$data['ip'];
-			elseif (!empty($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != $remoteip) $data['ip'] = $_SERVER['HTTP_CLIENT_IP'].' -> '.$data['ip'];
+			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != $remoteip) {
+				$data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].' -> '.$data['ip'];
+			} elseif (!empty($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != $remoteip) {
+				$data['ip'] = $_SERVER['HTTP_CLIENT_IP'].' -> '.$data['ip'];
+			}
 		} // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
-		elseif (!empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
+		elseif (!empty($_SERVER['SERVER_ADDR'])) {
+			$data['ip'] = $_SERVER['SERVER_ADDR'];
+		}
 		// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).
-		elseif (!empty($_SERVER['COMPUTERNAME'])) $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);
+		elseif (!empty($_SERVER['COMPUTERNAME'])) {
+			$data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);
+		}
 		// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).
-		elseif (!empty($_SERVER['LOGNAME'])) $data['ip'] = '???@'.$_SERVER['LOGNAME'];
+		elseif (!empty($_SERVER['LOGNAME'])) {
+			$data['ip'] = '???@'.$_SERVER['LOGNAME'];
+		}
 		// Loop on each log handler and send output
 		foreach ($conf->loghandlers as $loghandlerinstance)
 		{
-			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) continue;
+			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+				continue;
+			}
 			$loghandlerinstance->export($data, $suffixinfilename);
 		}
 		unset($data);
@@ -1184,7 +1307,9 @@ 
 
 	// Show title
 	$showtitle = 1;
-	if (!empty($conf->dol_optimize_smallscreen)) $showtitle = 0;
+	if (!empty($conf->dol_optimize_smallscreen)) {
+		$showtitle = 0;
+	}
 
 	$out = "\n".'<!-- dol_fiche_head - dol_get_fiche_head -->';
 
@@ -1193,14 +1318,19 @@ 
 	}
 
 	// Show right part
-	if ($morehtmlright) $out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.
+	if ($morehtmlright) {
+		$out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>';
+	}
+	// Output right area first so when space is missing, text is in front of tabs and not under.
 
 	// Show title
 	if (!empty($title) && $showtitle)
 	{
 		$limittitle = 30;
 		$out .= '<a class="tabTitle">';
-		if ($picto && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
+		if ($picto && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			$out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
+		}
 		$out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>';
 		$out .= '</a>';
 	}
@@ -1212,7 +1342,9 @@ 
 	if (is_array($links) && !empty($links))
 	{
 		$keys = array_keys($links);
-		if (count($keys)) $maxkey = max($keys);
+		if (count($keys)) {
+			$maxkey = max($keys);
+		}
 	}
 
 	// Show tabs
@@ -1220,7 +1352,9 @@ 
 	if (empty($limittoshow)) {
 		$limittoshow = (empty($conf->global->MAIN_MAXTABS_IN_CARD) ? 99 : $conf->global->MAIN_MAXTABS_IN_CARD);
 	}
-	if (!empty($conf->dol_optimize_smallscreen)) $limittoshow = 2;
+	if (!empty($conf->dol_optimize_smallscreen)) {
+		$limittoshow = 2;
+	}
 
 	$displaytab = 0;
 	$nbintab = 0;
@@ -1230,7 +1364,9 @@ 
 	{
 		if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {
 			// If active tab is already present
-			if ($i >= $limittoshow) $limittoshow--;
+			if ($i >= $limittoshow) {
+				$limittoshow--;
+			}
 		}
 	}
 
@@ -1278,9 +1414,11 @@ 
 			$outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';
 			if (isset($links[$i][2]) && $links[$i][2] == 'image')
 			{
-				if (!empty($links[$i][0]))
-					$outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				else $outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+				if (!empty($links[$i][0])) {
+									$outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+				} else {
+					$outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+				}
 			} elseif (!empty($links[$i][1]))
 			{
 				$outmore .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="wordwrap inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
@@ -1293,11 +1431,15 @@ 
 		}
 		$displaytab = $i;
 	}
-	if ($popuptab) $outmore .= '</div>';
+	if ($popuptab) {
+		$outmore .= '</div>';
+	}
 
-	if ($popuptab)	// If there is some tabs not shown
+	if ($popuptab) {
+		// If there is some tabs not shown
 	{
 		$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
+	}
 		$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
 
 		$tabsname = $moretabssuffix;
@@ -1320,7 +1462,9 @@ 
 		$out .= "</div>\n";
 	}
 
-	if (!$notab || $notab == -1 || $notab == -2) $out .= "\n".'<div class="tabBar'.($notab == -1 ? '' : ($notab == -2 ? ' tabBarNoTop' : ' tabBarWithBottom')).'">'."\n";
+	if (!$notab || $notab == -1 || $notab == -2) {
+		$out .= "\n".'<div class="tabBar'.($notab == -1 ? '' : ($notab == -2 ? ' tabBarNoTop' : ' tabBarWithBottom')).'">'."\n";
+	}
 
 	$parameters = array('tabname' => $active, 'out' => $out);
 	$reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"
@@ -1351,9 +1495,12 @@ 
  */
 function dol_get_fiche_end($notab = 0)
 {
-	if (!$notab || $notab == -1) return "\n</div>\n";
-	else return '';
-}
+	if (!$notab || $notab == -1) {
+		return "\n</div>\n";
+	} else {
+		return '';
+	}
+	}
 
 /**
  *  Show tab footer of a card.
@@ -1384,27 +1531,59 @@ 
 	$showimage = 1;
 	$entity = (empty($object->entity) ? $conf->entity : $object->entity);
 	$showbarcode = empty($conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+		$showbarcode = 0;
+	}
 	$modulepart = 'unknown';
 
-	if ($object->element == 'societe')         $modulepart = 'societe';
-	if ($object->element == 'contact')         $modulepart = 'contact';
-	if ($object->element == 'member')          $modulepart = 'memberphoto';
-	if ($object->element == 'user')            $modulepart = 'userphoto';
-	if ($object->element == 'product')         $modulepart = 'product';
-	if ($object->element == 'ticket')          $modulepart = 'ticket';
+	if ($object->element == 'societe') {
+		$modulepart = 'societe';
+	}
+	if ($object->element == 'contact') {
+		$modulepart = 'contact';
+	}
+	if ($object->element == 'member') {
+		$modulepart = 'memberphoto';
+	}
+	if ($object->element == 'user') {
+		$modulepart = 'userphoto';
+	}
+	if ($object->element == 'product') {
+		$modulepart = 'product';
+	}
+	if ($object->element == 'ticket') {
+		$modulepart = 'ticket';
+	}
 
 	if (class_exists("Imagick"))
 	{
-		if ($object->element == 'propal')            $modulepart = 'propal';
-		if ($object->element == 'commande')          $modulepart = 'commande';
-		if ($object->element == 'facture')           $modulepart = 'facture';
-		if ($object->element == 'fichinter')         $modulepart = 'ficheinter';
-		if ($object->element == 'contrat')           $modulepart = 'contract';
-		if ($object->element == 'supplier_proposal') $modulepart = 'supplier_proposal';
-		if ($object->element == 'order_supplier')    $modulepart = 'supplier_order';
-		if ($object->element == 'invoice_supplier')  $modulepart = 'supplier_invoice';
-		if ($object->element == 'expensereport')     $modulepart = 'expensereport';
+		if ($object->element == 'propal') {
+			$modulepart = 'propal';
+		}
+		if ($object->element == 'commande') {
+			$modulepart = 'commande';
+		}
+		if ($object->element == 'facture') {
+			$modulepart = 'facture';
+		}
+		if ($object->element == 'fichinter') {
+			$modulepart = 'ficheinter';
+		}
+		if ($object->element == 'contrat') {
+			$modulepart = 'contract';
+		}
+		if ($object->element == 'supplier_proposal') {
+			$modulepart = 'supplier_proposal';
+		}
+		if ($object->element == 'order_supplier') {
+			$modulepart = 'supplier_order';
+		}
+		if ($object->element == 'invoice_supplier') {
+			$modulepart = 'supplier_invoice';
+		}
+		if ($object->element == 'expensereport') {
+			$modulepart = 'expensereport';
+		}
 	}
 
 	if ($object->element == 'product')
@@ -1412,9 +1591,12 @@ 
 		$width = 80; $cssclass = 'photoref';
 		$showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);
 		$maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
-		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
-		if ($showimage) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
-		else {
+		if ($conf->browser->layout == 'phone') {
+			$maxvisiblephotos = 1;
+		}
+		if ($showimage) {
+			$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
+		} else {
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
@@ -1428,7 +1610,9 @@ 
 		$width = 80; $cssclass = 'photoref';
 		$showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref);
 		$maxvisiblephotos = (isset($conf->global->TICKET_MAX_VISIBLE_PHOTO) ? $conf->global->TICKET_MAX_VISIBLE_PHOTO : 2);
-		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
+		if ($conf->browser->layout == 'phone') {
+			$maxvisiblephotos = 1;
+		}
 		if ($showimage)
 		{
 			$showphoto = $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0);
@@ -1467,7 +1651,10 @@ 
 					} else {
 						$subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);
 					}
-					if (empty($subdir)) $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path
+					if (empty($subdir)) {
+						$subdir = 'errorgettingsubdirofobject';
+					}
+					// Protection to avoid to return empty path
 
 					$filepath = $dir_output.$subdir."/";
 
@@ -1486,11 +1673,15 @@ 
 						// Conversion du PDF en image png si fichier png non existant
 						if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))
 						{
-							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
+							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {
+								// If you experience trouble with pdf thumb generation and imagick, you can disable here.
 							{
 								include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+							}
 								$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
-								if ($ret < 0) $error++;
+								if ($ret < 0) {
+									$error++;
+								}
 							}
 						}
 					}
@@ -1498,7 +1689,9 @@ 
 					if ($pdfexists && !$error)
 					{
 						$heightforphotref = 70;
-						if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
+						if (!empty($conf->dol_optimize_smallscreen)) {
+							$heightforphotref = 60;
+						}
 						// If the preview file is found
 						if (file_exists($fileimage))
 						{
@@ -1520,9 +1713,11 @@ 
 				}
 			}
 
-			if (!$phototoshow)      // Show No photo link (picto of object)
+			if (!$phototoshow) {
+				// Show No photo link (picto of object)
 			{
 			    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
+			}
 				if ($object->element == 'action')
 				{
 					$width = 80;
@@ -1531,7 +1726,10 @@ 
 				} else {
 					$width = 14; $cssclass = 'photorefcenter';
 					$picto = $object->picto;
-					if ($object->element == 'project' && !$object->public) $picto = 'project'; // instead of projectpub
+					if ($object->element == 'project' && !$object->public) {
+						$picto = 'project';
+					}
+					// instead of projectpub
 					$nophoto = img_picto('No photo', 'object_'.$picto);
 				}
 				$morehtmlleft .= '<!-- No photo to show -->';
@@ -1544,7 +1742,9 @@ 
 		}
 	}
 
-	if ($showbarcode) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
+	if ($showbarcode) {
+		$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
+	}
 
 	if ($object->element == 'societe')
 	{
@@ -1572,26 +1772,40 @@ 
 	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
 	{
 		$tmptxt = $object->getLibStatut(6, $object->totalpaye);
-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
+			$tmptxt = $object->getLibStatut(5, $object->totalpaye);
+		}
 		$morehtmlstatus .= $tmptxt;
 	} elseif ($object->element == 'contrat' || $object->element == 'contract')
 	{
-		if ($object->statut == 0) $morehtmlstatus .= $object->getLibStatut(5);
-		else $morehtmlstatus .= $object->getLibStatut(4);
+		if ($object->statut == 0) {
+			$morehtmlstatus .= $object->getLibStatut(5);
+		} else {
+			$morehtmlstatus .= $object->getLibStatut(4);
+		}
 	} elseif ($object->element == 'facturerec')
 	{
-		if ($object->frequency == 0) $morehtmlstatus .= $object->getLibStatut(2);
-		else $morehtmlstatus .= $object->getLibStatut(5);
+		if ($object->frequency == 0) {
+			$morehtmlstatus .= $object->getLibStatut(2);
+		} else {
+			$morehtmlstatus .= $object->getLibStatut(5);
+		}
 	} elseif ($object->element == 'project_task')
 	{
 		$object->fk_statut = 1;
-		if ($object->progress > 0) $object->fk_statut = 2;
-		if ($object->progress >= 100) $object->fk_statut = 3;
+		if ($object->progress > 0) {
+			$object->fk_statut = 2;
+		}
+		if ($object->progress >= 100) {
+			$object->fk_statut = 3;
+		}
 		$tmptxt = $object->getLibStatut(5);
 		$morehtmlstatus .= $tmptxt; // No status on task
 	} else { // Generic case
 		$tmptxt = $object->getLibStatut(6);
-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
+			$tmptxt = $object->getLibStatut(5);
+		}
 		$morehtmlstatus .= $tmptxt;
 	}
 
@@ -1607,12 +1821,16 @@ 
 	}
 
 	// Add alias for thirdparty
-	if (!empty($object->name_alias)) $morehtmlref .= '<div class="refidno">'.$object->name_alias.'</div>';
+	if (!empty($object->name_alias)) {
+		$morehtmlref .= '<div class="refidno">'.$object->name_alias.'</div>';
+	}
 
 	// Add label
 	if (in_array($object->element, array('product', 'bank_account', 'project_task')))
 	{
-		if (!empty($object->label)) $morehtmlref .= '<div class="refidno">'.$object->label.'</div>';
+		if (!empty($object->label)) {
+			$morehtmlref .= '<div class="refidno">'.$object->label.'</div>';
+		}
 	}
 
 	if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files')))
@@ -1650,11 +1868,15 @@ 
 {
 	global $langs;
 	$ret = '';
-	if ($fieldrequired) $ret .= '<span class="fieldrequired">';
+	if ($fieldrequired) {
+		$ret .= '<span class="fieldrequired">';
+	}
 	$ret .= '<label for="'.$fieldkey.'">';
 	$ret .= $langs->trans($langkey);
 	$ret .= '</label>';
-	if ($fieldrequired) $ret .= '</span>';
+	if ($fieldrequired) {
+		$ret .= '</span>';
+	}
 	return $ret;
 }
 
@@ -1669,7 +1891,9 @@ 
 {
 	global $bc;
 	$ret = ' '.$bc[$var];
-	if ($moreclass) $ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);
+	if ($moreclass) {
+		$ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);
+	}
 	return $ret;
 }
 
@@ -1699,36 +1923,48 @@ 
 		$ret .= ($extralangcode ? $object->array_languages['address'][$extralangcode] : $object->address);
 	}
 	// Zip/Town/State
-	if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS))   	// US: title firstname name \n address lines \n town, state, zip \n country
+	if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {
+		// US: title firstname name \n address lines \n town, state, zip \n country
 	{
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
+	}
 		$ret .= ($ret ? $sep : '').$town;
 		if ($object->state)
 		{
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
-		if ($object->zip) $ret .= ($ret ? ", " : '').$object->zip;
-	} elseif (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
+		if ($object->zip) {
+			$ret .= ($ret ? ", " : '').$object->zip;
+		}
+	} elseif (in_array($object->country_code, array('GB', 'UK'))) {
+		// UK: title firstname name \n address lines \n town state \n zip \n country
 	{
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
+	}
 		$ret .= ($ret ? $sep : '').$town;
 		if ($object->state)
 		{
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
-		if ($object->zip) $ret .= ($ret ? $sep : '').$object->zip;
-	} elseif (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
+		if ($object->zip) {
+			$ret .= ($ret ? $sep : '').$object->zip;
+		}
+	} elseif (in_array($object->country_code, array('ES', 'TR'))) {
+		// ES: title firstname name \n address lines \n zip town \n state \n country
 	{
 		$ret .= ($ret ? $sep : '').$object->zip;
+	}
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
 		if ($object->state)
 		{
 			$ret .= "\n".$object->state;
 		}
-	} elseif (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
+	} elseif (in_array($object->country_code, array('IT'))) {
+		// IT: tile firstname name\n address lines \n zip (Code Departement) \n country
 	{
 		$ret .= ($ret ? $sep : '').$object->zip;
+	}
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
 		$ret .= ($object->state_code ? (' '.($object->state_code)) : '');
@@ -1742,7 +1978,9 @@ 
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 	}
-	if (!is_object($outputlangs)) $outputlangs = $langs;
+	if (!is_object($outputlangs)) {
+		$outputlangs = $langs;
+	}
 	if ($withcountry)
 	{
 		$langs->load("dict");
@@ -1766,8 +2004,10 @@ 
 {
 	if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
 		return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);
-	} else return 'Error date into a not supported range';
-}
+	} else {
+		return 'Error date into a not supported range';
+	}
+	}
 
 /**
  *	Output date in a string format according to outputlangs (or langs if not defined).
@@ -1817,31 +2057,57 @@ 
 			}
 		}
 	}
-	if (!is_object($outputlangs)) $outputlangs = $langs;
-	if (!$format) $format = 'daytextshort';
+	if (!is_object($outputlangs)) {
+		$outputlangs = $langs;
+	}
+	if (!$format) {
+		$format = 'daytextshort';
+	}
 	$reduceformat = (!empty($conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;
 	$formatwithoutreduce = preg_replace('/reduceformat/', '', $format);
 	if ($formatwithoutreduce != $format) { $format = $formatwithoutreduce; $reduceformat = 1; }  // so format 'dayreduceformat' is processed like day
 
 	// Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
 	// TODO Add format daysmallyear and dayhoursmallyear
-	if ($format == 'day')				$format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
-	elseif ($format == 'hour')			$format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
-	elseif ($format == 'hourduration')	$format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
-	elseif ($format == 'daytext')			 $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);
-	elseif ($format == 'daytextshort')	$format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);
-	elseif ($format == 'dayhour')			 $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
-	elseif ($format == 'dayhoursec')		 $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
-	elseif ($format == 'dayhourtext')		 $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
-	elseif ($format == 'dayhourtextshort') $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);
+	if ($format == 'day') {
+		$format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
+	} elseif ($format == 'hour') {
+		$format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
+	} elseif ($format == 'hourduration') {
+		$format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
+	} elseif ($format == 'daytext') {
+		$format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);
+	} elseif ($format == 'daytextshort') {
+		$format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);
+	} elseif ($format == 'dayhour') {
+		$format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
+	} elseif ($format == 'dayhoursec') {
+		$format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
+	} elseif ($format == 'dayhourtext') {
+		$format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
+	} elseif ($format == 'dayhourtextshort') {
+		$format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);
+	}
 	// Format not sensitive to language
-	elseif ($format == 'dayhourlog')		 $format = '%Y%m%d%H%M%S';
-	elseif ($format == 'dayhourldap')		 $format = '%Y%m%d%H%M%SZ';
-	elseif ($format == 'dayhourxcard')	$format = '%Y%m%dT%H%M%SZ';
-	elseif ($format == 'dayxcard')	 	$format = '%Y%m%d';
-	elseif ($format == 'dayrfc')			 $format = '%Y-%m-%d'; // DATE_RFC3339
-	elseif ($format == 'dayhourrfc')		 $format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339
-	elseif ($format == 'standard')		$format = '%Y-%m-%d %H:%M:%S';
+	elseif ($format == 'dayhourlog') {
+		$format = '%Y%m%d%H%M%S';
+	} elseif ($format == 'dayhourldap') {
+		$format = '%Y%m%d%H%M%SZ';
+	} elseif ($format == 'dayhourxcard') {
+		$format = '%Y%m%dT%H%M%SZ';
+	} elseif ($format == 'dayxcard') {
+		$format = '%Y%m%d';
+	} elseif ($format == 'dayrfc') {
+		$format = '%Y-%m-%d';
+	}
+	// DATE_RFC3339
+	elseif ($format == 'dayhourrfc') {
+		$format = '%Y-%m-%dT%H:%M:%SZ';
+	}
+	// DATETIME RFC3339
+	elseif ($format == 'standard') {
+		$format = '%Y-%m-%d %H:%M:%S';
+	}
 
 	if ($reduceformat)
 	{
@@ -1850,33 +2116,44 @@ 
 	}
 
 	// If date undefined or "", we return ""
-	if (dol_strlen($time) == 0) return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)
+	if (dol_strlen($time) == 0) {
+		return '';
+	}
+	// $time=0 allowed (it means 01/01/1970 00:00:00)
 
 	// Clean format
-	if (preg_match('/%b/i', $format))		// There is some text to translate
+	if (preg_match('/%b/i', $format)) {
+		// There is some text to translate
 	{
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
 		$format = str_replace('%b', '__b__', $format);
+	}
 		$format = str_replace('%B', '__B__', $format);
 	}
-	if (preg_match('/%a/i', $format))		// There is some text to translate
+	if (preg_match('/%a/i', $format)) {
+		// There is some text to translate
 	{
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
 		$format = str_replace('%a', '__a__', $format);
+	}
 		$format = str_replace('%A', '__A__', $format);
 	}
 
 
 	// Analyze date
 	$reg = array();
-	if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg))	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
+	if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) {
+		// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
 	{
 	    dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
+	}
 	    return '';
-	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg))    // Still available to solve problems in extrafields of type date
+	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg)) {
+		// Still available to solve problems in extrafields of type date
 	{
 	    // This part of code should not be used.
 	    dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);
+	}
 	    //if (function_exists('debug_print_backtrace')) debug_print_backtrace();
 	    // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
 	    $syear	= (!empty($reg[1]) ? $reg[1] : '');
@@ -1890,12 +2167,17 @@ 
 	    $ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
 	} else {
 		// Date is a timestamps
-		if ($time < 100000000000)	// Protection against bad date values
+		if ($time < 100000000000) {
+			// Protection against bad date values
 		{
-			$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+			$timetouse = $time + $offsettz + $offsetdst;
+		}
+		// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 			$ret = adodb_strftime($format, $timetouse, $to_gmt);
-		} else $ret = 'Bad value '.$time.' for date';
+		} else {
+			$ret = 'Bad value '.$time.' for date';
+		}
 	}
 
 	if (preg_match('/__b__/i', $format))
@@ -1971,8 +2253,14 @@ 
 	global $conf;
 
 	$usealternatemethod = false;
-	if ($timestamp <= 0) $usealternatemethod = true; // <= 1970
-	if ($timestamp >= 2145913200) $usealternatemethod = true; // >= 2038
+	if ($timestamp <= 0) {
+		$usealternatemethod = true;
+	}
+	// <= 1970
+	if ($timestamp >= 2145913200) {
+		$usealternatemethod = true;
+	}
+	// >= 2038
 
 	if ($usealternatemethod)
 	{
@@ -2009,19 +2297,37 @@ 
 	//print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";
 
 	// Clean parameters
-	if ($hour == -1 || empty($hour)) $hour = 0;
-	if ($minute == -1 || empty($minute)) $minute = 0;
-	if ($second == -1 || empty($second)) $second = 0;
+	if ($hour == -1 || empty($hour)) {
+		$hour = 0;
+	}
+	if ($minute == -1 || empty($minute)) {
+		$minute = 0;
+	}
+	if ($second == -1 || empty($second)) {
+		$second = 0;
+	}
 
 	// Check parameters
 	if ($check)
 	{
-		if (!$month || !$day)  return '';
-		if ($day > 31) return '';
-		if ($month > 12) return '';
-		if ($hour < 0 || $hour > 24) return '';
-		if ($minute < 0 || $minute > 60) return '';
-		if ($second < 0 || $second > 60) return '';
+		if (!$month || !$day) {
+			return '';
+		}
+		if ($day > 31) {
+			return '';
+		}
+		if ($month > 12) {
+			return '';
+		}
+		if ($hour < 0 || $hour > 24) {
+			return '';
+		}
+		if ($minute < 0 || $minute > 60) {
+			return '';
+		}
+		if ($second < 0 || $second > 60) {
+			return '';
+		}
 	}
 
 	if (empty($gm) || $gm === 'server')
@@ -2077,10 +2383,15 @@ 
 {
 	$ret = 0;
 
-	if ($mode == 'gmt') $ret = time(); // Time for now at greenwich.
-	elseif ($mode == 'tzserver')		// Time for now with PHP server timezone added
+	if ($mode == 'gmt') {
+		$ret = time();
+	}
+	// Time for now at greenwich.
+	elseif ($mode == 'tzserver') {
+		// Time for now with PHP server timezone added
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+	}
 		$tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time
 		$ret = (int) (dol_now('gmt') + ($tzsecond * 3600));
 	} /*elseif ($mode == 'tzref')				// Time for now with parent company timezone is added
@@ -2089,10 +2400,12 @@ 
 		$tzsecond=getParentCompanyTimeZoneInt();    // Contains tz+dayling saving time
 		$ret=dol_now('gmt')+($tzsecond*3600);
 	}*/
-	elseif ($mode == 'tzuser')				// Time for now with user timezone added
+	elseif ($mode == 'tzuser') {
+		// Time for now with user timezone added
 	{
 		//print 'time: '.time();
 		$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;
+	}
 		$offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60;
 		$ret = (int) (dol_now('gmt') + ($offsettz + $offsetdst));
 	}
@@ -2114,7 +2427,9 @@ 
 	global $conf, $langs;
 	$level = 1024;
 
-	if (!empty($conf->dol_optimize_smallscreen)) $shortunit = 1;
+	if (!empty($conf->dol_optimize_smallscreen)) {
+		$shortunit = 1;
+	}
 
 	// Set value text
 	if (empty($shortvalue) || $size < ($level * 10))
@@ -2146,15 +2461,23 @@ 
 {
 	global $langs;
 
-	if (empty($url)) return '';
+	if (empty($url)) {
+		return '';
+	}
 
 	$link = '<a href="';
-	if (!preg_match('/^http/i', $url)) $link .= 'http://';
+	if (!preg_match('/^http/i', $url)) {
+		$link .= 'http://';
+	}
 	$link .= $url;
 	$link .= '"';
-	if ($target) $link .= ' target="'.$target.'"';
+	if ($target) {
+		$link .= ' target="'.$target.'"';
+	}
 	$link .= '>';
-	if (!preg_match('/^http/i', $url)) $link .= 'http://';
+	if (!preg_match('/^http/i', $url)) {
+		$link .= 'http://';
+	}
 	$link .= dol_trunc($url, $max);
 	$link .= '</a>';
 	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("Url"), 'globe').' ' : '').$link.'</div>';
@@ -2178,14 +2501,20 @@ 
 
 	$newemail = $email;
 
-	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) $withpicto = 0;
+	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) {
+		$withpicto = 0;
+	}
 
-	if (empty($email)) return '&nbsp;';
+	if (empty($email)) {
+		return '&nbsp;';
+	}
 
 	if (!empty($addlink))
 	{
 		$newemail = '<a style="text-overflow: ellipsis;" href="';
-		if (!preg_match('/^mailto:/i', $email)) $newemail .= 'mailto:';
+		if (!preg_match('/^mailto:/i', $email)) {
+			$newemail .= 'mailto:';
+		}
 		$newemail .= $email;
 		$newemail .= '">';
 		$newemail .= dol_trunc($email, $max);
@@ -2199,8 +2528,12 @@ 
 		if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
 			$type = 'AC_EMAIL'; $link = '';
-			if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
-			if ($link) $newemail = '<div>'.$newemail.' '.$link.'</div>';
+			if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+				$link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+			}
+			if ($link) {
+				$newemail = '<div>'.$newemail.' '.$link.'</div>';
+			}
 		}
 	} else {
 		if ($showinvalid && !isValidEmail($email))
@@ -2266,7 +2599,9 @@ 
 
 	$htmllink = $value;
 
-	if (empty($value)) return '&nbsp;';
+	if (empty($value)) {
+		return '&nbsp;';
+	}
 
 	if (!empty($type))
 	{
@@ -2290,7 +2625,9 @@ 
 		{
 			$addlink = 'AC_SKYPE';
 			$link = '';
-			if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+			if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+				$link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+			}
 			$htmllink .= ($link ? ' '.$link : '');
 		}
 		$htmllink .= '</div>';
@@ -2322,11 +2659,17 @@ 
 	// Clean phone parameter
 	$phone = preg_replace("/[\s.-]/", "", trim($phone));
 	if (empty($phone)) { return ''; }
-	if ($conf->global->MAIN_PHONE_SEPAR) $separ = $conf->global->MAIN_PHONE_SEPAR;
-	if (empty($countrycode)) $countrycode = $mysoc->country_code;
+	if ($conf->global->MAIN_PHONE_SEPAR) {
+		$separ = $conf->global->MAIN_PHONE_SEPAR;
+	}
+	if (empty($countrycode)) {
+		$countrycode = $mysoc->country_code;
+	}
 
 	// Short format for small screens
-	if ($conf->dol_optimize_smallscreen) $separ = '';
+	if ($conf->dol_optimize_smallscreen) {
+		$separ = '';
+	}
 
 	$newphone = $phone;
 	if (strtoupper($countrycode) == "FR")
@@ -2572,21 +2915,29 @@ 
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);
 		}
 	}
-	if (!empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
+	if (!empty($addlink)) {
+		// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
 	{
 		if ($conf->browser->layout == 'phone' || (!empty($conf->clicktodial->enabled) && !empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone
 		{
 			$newphoneform = $newphone;
+	}
 			$newphone = '<a href="tel:'.$phone.'"';
 			$newphone .= '>'.$newphoneform.'</a>';
-		} elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
+		} elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL') {
+			// If click to dial, we use click to dial url
 		{
 			if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
+		}
 
 			// Define urlmask
 			$urlmask = 'ErrorClickToDialModuleNotConfigured';
-			if (!empty($conf->global->CLICKTODIAL_URL)) $urlmask = $conf->global->CLICKTODIAL_URL;
-			if (!empty($user->clicktodial_url)) $urlmask = $user->clicktodial_url;
+			if (!empty($conf->global->CLICKTODIAL_URL)) {
+				$urlmask = $conf->global->CLICKTODIAL_URL;
+			}
+			if (!empty($user->clicktodial_url)) {
+				$urlmask = $user->clicktodial_url;
+			}
 
 			$clicktodial_poste = (!empty($user->clicktodial_poste) ?urlencode($user->clicktodial_poste) : '');
 			$clicktodial_login = (!empty($user->clicktodial_login) ?urlencode($user->clicktodial_login) : '');
@@ -2601,7 +2952,9 @@ 
 			$url = make_substitutions($url, $substitarray);
 			$newphonesav = $newphone;
 			$newphone = '<a href="'.$url.'"';
-			if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) $newphone .= ' target="_blank"';
+			if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+				$newphone .= ' target="_blank"';
+			}
 			$newphone .= '>'.$newphonesav.'</a>';
 		}
 
@@ -2609,9 +2962,15 @@ 
 		if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
 			$type = 'AC_TEL'; $link = '';
-			if ($addlink == 'AC_FAX') $type = 'AC_FAX';
-			if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
-			if ($link) $newphone = '<div>'.$newphone.' '.$link.'</div>';
+			if ($addlink == 'AC_FAX') {
+				$type = 'AC_FAX';
+			}
+			if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE)) {
+				$link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+			}
+			if ($link) {
+				$newphone = '<div>'.$newphone.' '.$link.'</div>';
+			}
 		}
 	}
 
@@ -2640,11 +2999,17 @@ 
 				$picto = '';
 			}
 		}
-		if ($adddivfloat) $rep .= '<div class="nospan float" style="margin-right: 10px">';
-		else $rep .= '<span style="margin-right: 10px;">';
+		if ($adddivfloat) {
+			$rep .= '<div class="nospan float" style="margin-right: 10px">';
+		} else {
+			$rep .= '<span style="margin-right: 10px;">';
+		}
 		$rep .= ($withpicto ?img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;
-		if ($adddivfloat) $rep .= '</div>';
-		else $rep .= '</span>';
+		if ($adddivfloat) {
+			$rep .= '</div>';
+		} else {
+			$rep .= '</span>';
+		}
 	}
 
 	return $rep;
@@ -2663,17 +3028,23 @@ 
 
 	$ret = '';
 
-	if (empty($mode)) $ret .= $ip;
+	if (empty($mode)) {
+		$ret .= $ip;
+	}
 
 	if ($mode != 2)
 	{
 		$countrycode = dolGetCountryCodeFromIp($ip);
-		if ($countrycode)	// If success, countrycode is us, fr, ...
+		if ($countrycode) {
+			// If success, countrycode is us, fr, ...
 		{
 			if (file_exists(DOL_DOCUMENT_ROOT.'/theme/common/flags/'.$countrycode.'.png'))
 			{
 				$ret .= ' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"), DOL_URL_ROOT.'/theme/common/flags/'.$countrycode.'.png', '', 1);
-			} else $ret .= ' ('.$countrycode.')';
+		}
+			} else {
+				$ret .= ' ('.$countrycode.')';
+			}
 		} else {
 			// Nothing
 		}
@@ -2776,17 +3147,32 @@ 
 		}
 		if (empty($reshook))
 		{
-			if (empty($charfornl)) $out .= nl2br($address);
-			else $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+			if (empty($charfornl)) {
+				$out .= nl2br($address);
+			} else {
+				$out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+			}
 
 			// TODO Remove this block, we can add this using the hook now
 			$showgmap = $showomap = 0;
-			if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) $showgmap = 1;
-			if ($element == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) $showgmap = 1;
-			if ($element == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) $showgmap = 1;
-			if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) $showomap = 1;
-			if ($element == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) $showomap = 1;
-			if ($element == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) $showomap = 1;
+			if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) {
+				$showgmap = 1;
+			}
+			if ($element == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+				$showgmap = 1;
+			}
+			if ($element == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+				$showgmap = 1;
+			}
+			if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+				$showomap = 1;
+			}
+			if ($element == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+				$showomap = 1;
+			}
+			if ($element == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+				$showomap = 1;
+			}
 			if ($showgmap)
 			{
 				$url = dol_buildpath('/google/gmaps.php?mode='.$element.'&id='.$id, 1);
@@ -2799,9 +3185,12 @@ 
 			}
 		}
 	}
-	if ($noprint) return $out;
-	else print $out;
-}
+	if ($noprint) {
+		return $out;
+	} else {
+		print $out;
+	}
+	}
 
 
 /**
@@ -2813,8 +3202,12 @@ 
  */
 function isValidEmail($address, $acceptsupervisorkey = 0)
 {
-	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') return true;
-	if (filter_var($address, FILTER_VALIDATE_EMAIL)) return true;
+	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+		return true;
+	}
+	if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+		return true;
+	}
 
 	return false;
 }
@@ -2839,8 +3232,12 @@ 
 			$mxhosts = array();
 			$weight = array();
 			getmxrr(idn_to_ascii($domain), $mxhosts, $weight);
-			if (count($mxhosts) > 1) return 1;
-			if (count($mxhosts) == 1 && !empty($mxhosts[0])) return 1;
+			if (count($mxhosts) > 1) {
+				return 1;
+			}
+			if (count($mxhosts) == 1 && !empty($mxhosts[0])) {
+				return 1;
+			}
 
 			return 0;
 		}
@@ -2870,9 +3267,12 @@ 
  */
 function dol_strlen($string, $stringencoding = 'UTF-8')
 {
-	if (function_exists('mb_strlen')) return mb_strlen($string, $stringencoding);
-	else return strlen($string);
-}
+	if (function_exists('mb_strlen')) {
+		return mb_strlen($string, $stringencoding);
+	} else {
+		return strlen($string);
+	}
+	}
 
 /**
  * Make a substring. Works even if mbstring module is not enabled for better compatibility.
@@ -2888,7 +3288,9 @@ 
 {
 	global $langs;
 
-	if (empty($stringencoding)) $stringencoding = $langs->charset_output;
+	if (empty($stringencoding)) {
+		$stringencoding = $langs->charset_output;
+	}
 
 	$ret = '';
 	if (empty($trunconbytes))
@@ -2928,20 +3330,29 @@ 
 {
 	global $conf;
 
-	if ($size == 0 || !empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
+	if ($size == 0 || !empty($conf->global->MAIN_DISABLE_TRUNC)) {
+		return $string;
+	}
 
-	if (empty($stringencoding)) $stringencoding = 'UTF-8';
+	if (empty($stringencoding)) {
+		$stringencoding = 'UTF-8';
+	}
 	// reduce for small screen
-	if ($conf->dol_optimize_smallscreen == 1 && $display == 1) $size = round($size / 3);
+	if ($conf->dol_optimize_smallscreen == 1 && $display == 1) {
+		$size = round($size / 3);
+	}
 
 	// We go always here
 	if ($trunc == 'right')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
-		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+			// If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');
-		else //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
+		} else {
+			//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
 		return $string;
+		}
 	} elseif ($trunc == 'middle')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
@@ -2950,21 +3361,30 @@ 
 			$size1 = round($size / 2);
 			$size2 = round($size / 2);
 			return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);
-		} else return $string;
+		} else {
+			return $string;
+		}
 	} elseif ($trunc == 'left')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
-		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+			// If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return '...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
-		else return $string;
+		} else {
+			return $string;
+		}
 	} elseif ($trunc == 'wrap')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
-		if (dol_strlen($newstring, $stringencoding) > ($size + 1))
-		return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
-		else return $string;
-	} else return 'BadParam3CallingDolTrunc';
-}
+		if (dol_strlen($newstring, $stringencoding) > ($size + 1)) {
+				return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
+		} else {
+			return $string;
+		}
+	} else {
+		return 'BadParam3CallingDolTrunc';
+	}
+	}
 
 /**
  *	Show picto whatever it's its name (generic function)
@@ -3097,7 +3517,9 @@ 
 			} elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {
 			    $convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');
 			    $fakey = 'fa-'.$convertarray[$pictowithouttext];
-			    if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
+			    if (preg_match('/selected/', $pictowithouttext)) {
+			    	$facolor = '#888';
+			    }
 				$marginleftonlyshort = 1;
 			} elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
 			{
@@ -3239,9 +3661,12 @@ 
  */
 function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)
 {
-	if (strpos($picto, '^') === 0) return img_picto($titlealt, str_replace('^', '', $picto), $moreatt, $pictoisfullpath, $srconly, $notitle);
-	else return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);
-}
+	if (strpos($picto, '^') === 0) {
+		return img_picto($titlealt, str_replace('^', '', $picto), $moreatt, $pictoisfullpath, $srconly, $notitle);
+	} else {
+		return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);
+	}
+	}
 
 /**
  *	Show weather picto
@@ -3263,7 +3688,9 @@ 
 		$leveltopicto = array(0=>'weather-clear.png', 1=>'weather-few-clouds.png', 2=>'weather-clouds.png', 3=>'weather-many-clouds.png', 4=>'weather-storm.png');
 		//return '<i class="fa fa-weather-level'.$picto.'"></i>';
 		$picto = $leveltopicto[$picto];
-	} elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	} elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+		$picto .= '.png';
+	}
 
 	$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
 
@@ -3284,17 +3711,22 @@ 
 {
 	global $conf;
 
-	if (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+		$picto .= '.png';
+	}
 
-	if ($pictoisfullpath) $path = $picto;
-	else {
+	if ($pictoisfullpath) {
+		$path = $picto;
+	} else {
 		$path = DOL_URL_ROOT.'/theme/common/'.$picto;
 
 		if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS))
 		{
 			$themepath = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/'.$picto;
 
-			if (file_exists($themepath)) $path = $themepath;
+			if (file_exists($themepath)) {
+				$path = $themepath;
+			}
 		}
 	}
 
@@ -3334,7 +3766,9 @@ 
 			$numaction = 0;
 		}
 	}
-	if (!is_numeric($numaction)) $numaction = 0;
+	if (!is_numeric($numaction)) {
+		$numaction = 0;
+	}
 
 	return img_picto($titlealt, 'stcomm'.$numaction.'.png');
 }
@@ -3350,7 +3784,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Show');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Show');
+	}
 
 	return img_picto($titlealt, 'pdf'.$size.'.png');
 }
@@ -3366,7 +3802,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Add');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Add');
+	}
 
 	return img_picto($titlealt, 'edit_add.png', $other);
 }
@@ -3381,7 +3819,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Remove');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Remove');
+	}
 
 	return img_picto($titlealt, 'edit_remove.png', $other);
 }
@@ -3398,7 +3838,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Modify');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Modify');
+	}
 
 	return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right').'"' : "").($other ? ' '.$other : ''));
 }
@@ -3415,7 +3857,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('View');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('View');
+	}
 
 	$moreatt = ($float ? 'style="float: right" ' : '').$other;
 
@@ -3434,7 +3878,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Delete');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Delete');
+	}
 
 	return img_picto($titlealt, 'delete.png', $other, false, 0, 0, '', $morecss);
 }
@@ -3449,7 +3895,9 @@ 
 function img_printer($titlealt = "default", $other = '')
 {
 	global $langs;
-	if ($titlealt == "default") $titlealt = $langs->trans("Print");
+	if ($titlealt == "default") {
+		$titlealt = $langs->trans("Print");
+	}
 	return img_picto($titlealt, 'printer.png', $other);
 }
 
@@ -3464,7 +3912,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Split');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Split');
+	}
 
 	return img_picto($titlealt, 'split.png', $other);
 }
@@ -3482,8 +3932,11 @@ 
 
 	if ($usealttitle)
 	{
-		if (is_string($usealttitle)) $usealttitle = dol_escape_htmltag($usealttitle);
-		else $usealttitle = $langs->trans('Info');
+		if (is_string($usealttitle)) {
+			$usealttitle = dol_escape_htmltag($usealttitle);
+		} else {
+			$usealttitle = $langs->trans('Info');
+		}
 	}
 
 	return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')).'"');
@@ -3499,7 +3952,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Informations');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Informations');
+	}
 
 	return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');
 }
@@ -3516,7 +3971,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Warning');
+	}
 
 	//return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';
 	return img_picto($titlealt, 'warning.png', 'class="'.$morecss.'"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt) : ''));
@@ -3532,7 +3989,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Error');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Error');
+	}
 
 	return img_picto($titlealt, 'error.png');
 }
@@ -3548,7 +4007,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Next');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Next');
+	}
 
 	//return img_picto($titlealt, 'next.png', $moreatt);
 	return '<span class="fa fa-chevron-right paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
@@ -3565,7 +4026,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Previous');
+	}
 
 	//return img_picto($titlealt, 'previous.png', $moreatt);
 	return '<span class="fa fa-chevron-left paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
@@ -3583,7 +4046,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Down');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Down');
+	}
 
 	return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass ? " ".$moreclass : "").'"');
 }
@@ -3600,7 +4065,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Up');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Up');
+	}
 
 	return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass ? " ".$moreclass : "").'"');
 }
@@ -3636,7 +4103,9 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Right');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Right');
+	}
 
 	return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);
 }
@@ -3652,9 +4121,13 @@ 
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Active');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Active');
+	}
 
-	if ($allow == 1) return img_picto($titlealt, 'tick.png');
+	if ($allow == 1) {
+		return img_picto($titlealt, 'tick.png');
+	}
 
 	return '-';
 }
@@ -3668,7 +4141,9 @@ 
  */
 function img_credit_card($brand, $morecss = null)
 {
-	if (is_null($morecss)) $morecss = 'fa-2x';
+	if (is_null($morecss)) {
+		$morecss = 'fa-2x';
+	}
 
 	if ($brand == 'visa' || $brand == 'Visa') {
 		$brand = 'cc-visa';
@@ -3705,7 +4180,9 @@ 
 	$mimeimg = dol_mimetype($file, '', 2);
 	$mimefa = dol_mimetype($file, '', 4);
 
-	if (empty($titlealt)) $titlealt = 'Mime type: '.$mimetype;
+	if (empty($titlealt)) {
+		$titlealt = 'Mime type: '.$mimetype;
+	}
 
 	//return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');
 	return '<i class="fa fa-'.$mimefa.' paddingright"'.($titlealt ? ' title="'.$titlealt.'"' : '').'></i>';
@@ -3723,7 +4200,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Search');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Search');
+	}
 
 	$img = img_picto($titlealt, 'search.png', $other, false, 1);
 
@@ -3744,7 +4223,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Search');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Search');
+	}
 
 	$img = img_picto($titlealt, 'searchclear.png', $other, false, 1);
 
@@ -3773,7 +4254,9 @@ 
 	{
 		$result = img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');
 	} else {
-		if (empty($conf->use_javascript_ajax)) $textfordropdown = '';
+		if (empty($conf->use_javascript_ajax)) {
+			$textfordropdown = '';
+		}
 
 		$class = (empty($admin) ? 'undefined' : ($admin == '1' ? 'info' : $admin));
 		$result = ($nodiv ? '' : '<div class="'.$class.' hideonsmartphone'.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');
@@ -3826,15 +4309,21 @@ 
 	// Load translation files required by the page
     $langs->loadLangs(array('main', 'errors'));
 
-	if ($_SERVER['DOCUMENT_ROOT'])    // Mode web
+	if ($_SERVER['DOCUMENT_ROOT']) {
+		// Mode web
 	{
 		$out .= $langs->trans("DolibarrHasDetectedError").".<br>\n";
-		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+	}
+		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+			$out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+		}
 		$out .= $langs->trans("InformationToHelpDiagnose").":<br>\n";
 
 		$out .= "<b>".$langs->trans("Date").":</b> ".dol_print_date(time(), 'dayhourlog')."<br>\n";
 		$out .= "<b>".$langs->trans("Dolibarr").":</b> ".DOL_VERSION." - https://www.dolibarr.org<br>\n";
-		if (isset($conf->global->MAIN_FEATURES_LEVEL)) $out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".$conf->global->MAIN_FEATURES_LEVEL."<br>\n";
+		if (isset($conf->global->MAIN_FEATURES_LEVEL)) {
+			$out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".$conf->global->MAIN_FEATURES_LEVEL."<br>\n";
+		}
 		if (function_exists("phpversion"))
 		{
 			$out .= "<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";
@@ -3865,9 +4354,11 @@ 
 
 	if (is_object($db))
 	{
-		if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
+		if ($_SERVER['DOCUMENT_ROOT']) {
+			// Mode web
 		{
 			$out .= "<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
+		}
 			$out .= "<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror() ?dol_escape_htmltag($db->lastqueryerror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out .= "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ?dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out .= "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ?dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
@@ -3889,17 +4380,26 @@ 
 		$langs->load("errors");
 
 		// Merge all into $errors array
-		if (is_array($error) && is_array($errors)) $errors = array_merge($error, $errors);
-		elseif (is_array($error)) $errors = $error;
-		elseif (is_array($errors)) $errors = array_merge(array($error), $errors);
-		else $errors = array_merge(array($error));
+		if (is_array($error) && is_array($errors)) {
+			$errors = array_merge($error, $errors);
+		} elseif (is_array($error)) {
+			$errors = $error;
+		} elseif (is_array($errors)) {
+			$errors = array_merge(array($error), $errors);
+		} else {
+			$errors = array_merge(array($error));
+		}
 
 		foreach ($errors as $msg)
 		{
-			if (empty($msg)) continue;
-			if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
+			if (empty($msg)) {
+				continue;
+			}
+			if ($_SERVER['DOCUMENT_ROOT']) {
+				// Mode web
 			{
 				$out .= "<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n";
+			}
 			} else // Mode CLI
 			{
 				$out .= '> '.$langs->transnoentities("Message").":\n".$msg."\n";
@@ -3917,8 +4417,9 @@ 
 		$out .= "<br>\n";
 	}
 
-	if (empty($dolibarr_main_prod)) print $out;
-	else {
+	if (empty($dolibarr_main_prod)) {
+		print $out;
+	} else {
 		// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.
 		print 'This website or feature is currently temporarly not available.<br><br>This may be due to a maintenance operation. Current status of operation are on next line...<br><br>'."\n";
 		$langs->load("errors");
@@ -3944,14 +4445,18 @@ 
 {
 	global $langs, $conf;
 
-	if (empty($email)) $email = $conf->global->MAIN_INFO_SOCIETE_MAIL;
+	if (empty($email)) {
+		$email = $conf->global->MAIN_INFO_SOCIETE_MAIL;
+	}
 
 	$langs->load("errors");
 	$now = dol_now();
 
 	print '<br><div class="center login_main_message"><div class="'.$morecss.'">';
 	print $langs->trans("ErrorContactEMail", $email, $prefixcode.dol_print_date($now, '%Y%m%d%H%M%S'));
-	if ($errormessage) print '<br><br>'.$errormessage;
+	if ($errormessage) {
+		print '<br><br>'.$errormessage;
+	}
 	if (is_array($errormessages) && count($errormessages))
 	{
 		foreach ($errormessages as $mesgtoshow)
@@ -4004,14 +4509,19 @@ 
 	global $conf, $langs, $form;
 	//print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder<br>\n";
 
-	if ($moreattrib == 'class="right"') $prefix .= 'right '; // For backward compatibility
+	if ($moreattrib == 'class="right"') {
+		$prefix .= 'right ';
+	}
+	// For backward compatibility
 
 	$sortorder = strtoupper($sortorder);
 	$out = '';
 	$sortimg = '';
 
 	$tag = 'th';
-	if ($thead == 2) $tag = 'div';
+	if ($thead == 2) {
+		$tag = 'div';
+	}
 
 	$tmpsortfield = explode(',', $sortfield);
 	$sortfield1 = trim($tmpsortfield[0]); // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'
@@ -4034,28 +4544,36 @@ 
 		$out .= '>';
 	}
 
-	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
+	if (empty($thead) && $field && empty($disablesortlink)) {
+		// If this is a sort field
 	{
 		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', $moreparam);
+	}
 		$options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);
 		$options = preg_replace('/&+/i', '&', $options);
-		if (!preg_match('/^&/', $options)) $options = '&'.$options;
+		if (!preg_match('/^&/', $options)) {
+			$options = '&'.$options;
+		}
 
 		$sortordertouseinlink = '';
-		if ($field1 != $sortfield1) // We are on another field than current sorted field
+		if ($field1 != $sortfield1) {
+			// We are on another field than current sorted field
 		{
 			if (preg_match('/^DESC/i', $sortorder))
 			{
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
+		}
 			} else // We reverse the var $sortordertouseinlink
 			{
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
 			}
 		} else // We are on field that is the first current sorting criteria
 		{
-			if (preg_match('/^ASC/i', $sortorder))	// We reverse the var $sortordertouseinlink
+			if (preg_match('/^ASC/i', $sortorder)) {
+				// We reverse the var $sortordertouseinlink
 			{
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
+			}
 			} else {
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
 			}
@@ -4066,20 +4584,29 @@ 
 		$out .= '>';
 	}
 
-	if ($tooltip) $out .= $form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
-	else $out .= $langs->trans($name);
+	if ($tooltip) {
+		$out .= $form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
+	} else {
+		$out .= $langs->trans($name);
+	}
 
-	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
+	if (empty($thead) && $field && empty($disablesortlink)) {
+		// If this is a sort field
 	{
 		$out .= '</a>';
 	}
+	}
 
-	if (empty($thead) && $field)    // If this is a sort field
+	if (empty($thead) && $field) {
+		// If this is a sort field
 	{
 		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', $moreparam);
+	}
 		$options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);
 		$options = preg_replace('/&+/i', '&', $options);
-		if (!preg_match('/^&/', $options)) $options = '&'.$options;
+		if (!preg_match('/^&/', $options)) {
+			$options = '&'.$options;
+		}
 
 		if (!$sortorder || $field1 != $sortfield1)
 		{
@@ -4156,12 +4683,16 @@ 
 
 	$return = '';
 
-	if ($picto == 'setup') $picto = 'generic';
+	if ($picto == 'setup') {
+		$picto = 'generic';
+	}
 
 	$return .= "\n";
 	$return .= '<table '.($id ? 'id="'.$id.'" ' : '').'class="centpercent notopnoleftnoright table-fiche-title'.($morecssontable ? ' '.$morecssontable : '').'">'; // maring bottom must be same than into print_barre_list
 	$return .= '<tr class="titre">';
-	if ($picto) $return .= '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';
+	if ($picto) {
+		$return .= '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';
+	}
 	$return .= '<td class="nobordernopadding valignmiddle col-title">';
 	$return .= '<div class="titre inline-block">'.$titre.'</div>';
 	$return .= '</td>';
@@ -4209,9 +4740,15 @@ 
 	$savtotalnboflines = $totalnboflines;
 	$totalnboflines = abs($totalnboflines);
 
-	if ($picto == 'setup') $picto = 'title_setup.png';
-	if (($conf->browser->name == 'ie') && $picto == 'generic') $picto = 'title.gif';
-	if ($limit < 0) $limit = $conf->liste_limit;
+	if ($picto == 'setup') {
+		$picto = 'title_setup.png';
+	}
+	if (($conf->browser->name == 'ie') && $picto == 'generic') {
+		$picto = 'title.gif';
+	}
+	if ($limit < 0) {
+		$limit = $conf->liste_limit;
+	}
 	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))
 	{
 		$nextpage = 1;
@@ -4226,10 +4763,14 @@ 
 
 	// Left
 
-	if ($picto && $titre) print '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';
+	if ($picto && $titre) {
+		print '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';
+	}
 	print '<td class="nobordernopadding valignmiddle col-title">';
 	print '<div class="titre inline-block">'.$titre;
-	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print '<span class="opacitymedium colorblack paddingleft">('.$totalnboflines.')</span>';
+	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+		print '<span class="opacitymedium colorblack paddingleft">('.$totalnboflines.')</span>';
+	}
 	print '</div></td>';
 
 	// Center
@@ -4240,19 +4781,28 @@ 
 
 	// Right
 	print '<td class="nobordernopadding valignmiddle right">';
-	if ($sortfield) $options .= "&sortfield=".urlencode($sortfield);
-	if ($sortorder) $options .= "&sortorder=".urlencode($sortorder);
+	if ($sortfield) {
+		$options .= "&sortfield=".urlencode($sortfield);
+	}
+	if ($sortorder) {
+		$options .= "&sortorder=".urlencode($sortorder);
+	}
 	// Show navigation bar
 	$pagelist = '';
 	if ($savlimit != 0 && ($page > 0 || $num > $limit))
 	{
-		if ($totalnboflines)	// If we know total nb of lines
+		if ($totalnboflines) {
+			// If we know total nb of lines
 		{
 			// Define nb of extra page links before and after selected page + ... + first or last
 			$maxnbofpage = (empty($conf->dol_optimize_smallscreen) ? 4 : 0);
+		}
 
-			if ($limit > 0) $nbpages = ceil($totalnboflines / $limit);
-			else $nbpages = 1;
+			if ($limit > 0) {
+				$nbpages = ceil($totalnboflines / $limit);
+			} else {
+				$nbpages = 1;
+			}
 			$cpt = ($page - $maxnbofpage);
 			if ($cpt < 0) { $cpt = 0; }
 
@@ -4260,8 +4810,11 @@ 
 			{
 				if (empty($pagenavastextinput)) {
 					$pagelist .= '<li class="pagination"><a href="'.$file.'?page=0'.$options.'">1</a></li>';
-					if ($cpt > 2) $pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';
-					elseif ($cpt == 2) $pagelist .= '<li class="pagination"><a href="'.$file.'?page=1'.$options.'">2</a></li>';
+					if ($cpt > 2) {
+						$pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';
+					} elseif ($cpt == 2) {
+						$pagelist .= '<li class="pagination"><a href="'.$file.'?page=1'.$options.'">2</a></li>';
+					}
 				}
 			}
 
@@ -4287,8 +4840,11 @@ 
 			if (empty($pagenavastextinput)) {
 				if ($cpt < $nbpages)
 				{
-					if ($cpt < $nbpages - 2) $pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';
-					elseif ($cpt == $nbpages - 2) $pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';
+					if ($cpt < $nbpages - 2) {
+						$pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';
+					} elseif ($cpt == $nbpages - 2) {
+						$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';
+					}
 					$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
 				}
 			} else {
@@ -4348,15 +4904,21 @@ 
 		$pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
 		//$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
 		//$pagesizechoices.=',2:2';
-		if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;
+		if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) {
+			$pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;
+		}
 
 		print '<li class="pagination">';
 		print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';
 		$tmpchoice = explode(',', $pagesizechoices);
 		$tmpkey = $limit.':'.$limit;
-		if (!in_array($tmpkey, $tmpchoice)) $tmpchoice[] = $tmpkey;
+		if (!in_array($tmpkey, $tmpchoice)) {
+			$tmpchoice[] = $tmpkey;
+		}
 		$tmpkey = $conf->liste_limit.':'.$conf->liste_limit;
-		if (!in_array($tmpkey, $tmpchoice)) $tmpchoice[] = $tmpkey;
+		if (!in_array($tmpkey, $tmpchoice)) {
+			$tmpchoice[] = $tmpkey;
+		}
 		asort($tmpchoice, SORT_NUMERIC);
 		foreach ($tmpchoice as $val)
 		{
@@ -4444,12 +5006,15 @@ 
 	}
 
 	// If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()
-	if (!preg_match('/\//', $rate)) $ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');
-	else {
+	if (!preg_match('/\//', $rate)) {
+		$ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');
+	} else {
 		// TODO Split on / and output with a price2num to have clean numbers without ton of 000.
 		$ret = $rate.($addpercent ? '%' : '');
 	}
-	if (($info_bits & 1) && $usestarfornpr >= 0) $ret .= ' *';
+	if (($info_bits & 1) && $usestarfornpr >= 0) {
+		$ret .= ' *';
+	}
 	$ret .= $morelabel;
 	return $ret;
 }
@@ -4475,21 +5040,35 @@ 
 	global $langs, $conf;
 
 	// Clean parameters
-	if (empty($amount)) $amount = 0; // To have a numeric value if amount not defined or = ''
+	if (empty($amount)) {
+		$amount = 0;
+	}
+	// To have a numeric value if amount not defined or = ''
 	$amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
-	if ($rounding < 0) $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+	if ($rounding < 0) {
+		$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+	}
 	$nbdecimal = $rounding;
 
 	// Output separators by default (french)
 	$dec = ','; $thousand = ' ';
 
 	// If $outlangs not forced, we use use language
-	if (!is_object($outlangs)) $outlangs = $langs;
+	if (!is_object($outlangs)) {
+		$outlangs = $langs;
+	}
 
-	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
-	if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
-	if ($thousand == 'None') $thousand = '';
-	elseif ($thousand == 'Space') $thousand = ' ';
+	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+		$dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+	}
+	if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+		$thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+	}
+	if ($thousand == 'None') {
+		$thousand = '';
+	} elseif ($thousand == 'Space') {
+		$thousand = ' ';
+	}
 	//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
 	//print "amount=".$amount."-";
@@ -4502,7 +5081,9 @@ 
 	$end = '';
 
 	// We increase nbdecimal if there is more decimal than asked (to not loose information)
-	if (dol_strlen($decpart) > $nbdecimal) $nbdecimal = dol_strlen($decpart);
+	if (dol_strlen($decpart) > $nbdecimal) {
+		$nbdecimal = dol_strlen($decpart);
+	}
 	// Si on depasse max
 	if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN)
 	{
@@ -4515,7 +5096,9 @@ 
 	}
 
 	// If force rounding
-	if ($forcerounding >= 0) $nbdecimal = $forcerounding;
+	if ($forcerounding >= 0) {
+		$nbdecimal = $forcerounding;
+	}
 
 	// Format number
 	$output = number_format($amount, $nbdecimal, $dec, $thousand);
@@ -4528,7 +5111,9 @@ 
 	$cursymbolbefore = $cursymbolafter = '';
 	if ($currency_code)
 	{
-		if ($currency_code == 'auto') $currency_code = $conf->currency;
+		if ($currency_code == 'auto') {
+			$currency_code = $conf->currency;
+		}
 
 		$listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD');
 		$listoflanguagesbefore = array('nl_NL');
@@ -4572,14 +5157,22 @@ 
 	// Numbers must be '1234.56'
 	// Decimal delimiter for PHP and database SQL requests must be '.'
 	$dec = ','; $thousand = ' ';
-	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
-	if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
-	if ($thousand == 'None') $thousand = '';
-	elseif ($thousand == 'Space') $thousand = ' ';
+	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+		$dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
+	}
+	if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+		$thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
+	}
+	if ($thousand == 'None') {
+		$thousand = '';
+	} elseif ($thousand == 'Space') {
+		$thousand = ' ';
+	}
 	//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
 	// Convert value to universal number format (no thousand separator, '.' as decimal separator)
-	if ($alreadysqlnb != 1)	// If not a PHP number or unknown, we change format
+	if ($alreadysqlnb != 1) {
+		// If not a PHP number or unknown, we change format
 	{
 		//print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';
 
@@ -4588,7 +5181,9 @@ 
 		if (is_numeric($amount))
 		{
 			// We put in temps value of decimal ("0.00001"). Works with 0 and 2.0E-5 and 9999.10
-			$temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000
+			$temps = sprintf("%0.10F", $amount - intval($amount));
+	}
+	// temps=0.0000000000 or 0.0000200000 or 9999.1000000000
 			$temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1
 			$nbofdec = max(0, dol_strlen($temps) - 2); // -2 to remove "0."
 			$amount = number_format($amount, $nbofdec, $dec, $thousand);
@@ -4596,7 +5191,10 @@ 
 		//print "QQ".$amount.'<br>';
 
 		// Now make replace (the main goal of function)
-		if ($thousand != ',' && $thousand != '.') $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+		if ($thousand != ',' && $thousand != '.') {
+			$amount = str_replace(',', '.', $amount);
+		}
+		// To accept 2 notations for french users
 		$amount = str_replace(' ', '', $amount); // To avoid spaces
 		$amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
 		$amount = str_replace($dec, '.', $amount);
@@ -4606,14 +5204,25 @@ 
 	if ($rounding)
 	{
 		$nbofdectoround = '';
-		if ($rounding == 'MU')     $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
-		elseif ($rounding == 'MT') $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
-		elseif ($rounding == 'MS') $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
-		elseif ($rounding == 'CR') $nbofdectoround = 8;
-		elseif (is_numeric($rounding))  $nbofdectoround = $rounding;
+		if ($rounding == 'MU') {
+			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
+		} elseif ($rounding == 'MT') {
+			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
+		} elseif ($rounding == 'MS') {
+			$nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
+		} elseif ($rounding == 'CR') {
+			$nbofdectoround = 8;
+		} elseif (is_numeric($rounding)) {
+			$nbofdectoround = $rounding;
+		}
 		//print "RR".$amount.' - '.$nbofdectoround.'<br>';
-		if (dol_strlen($nbofdectoround)) $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.
-		else return 'ErrorBadParameterProvidedToFunction';
+		if (dol_strlen($nbofdectoround)) {
+			$amount = round($amount, $nbofdectoround);
+		}
+		// $nbofdectoround can be 0.
+		else {
+			return 'ErrorBadParameterProvidedToFunction';
+		}
 		//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';
 
 		// Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number
@@ -4630,7 +5239,10 @@ 
 
 		// Always make replace because each math function (like round) replace
 		// with local values and we want a number that has a SQL string format x.y
-		if ($thousand != ',' && $thousand != '.') $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+		if ($thousand != ',' && $thousand != '.') {
+			$amount = str_replace(',', '.', $amount);
+		}
+		// To accept 2 notations for french users
 		$amount = str_replace(' ', '', $amount); // To avoid spaces
 		$amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
 		$amount = str_replace($dec, '.', $amount);
@@ -4706,15 +5318,19 @@ 
 {
 	global $db, $conf, $mysoc;
 
-	if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) $thirdparty_seller = $mysoc;
+	if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) {
+		$thirdparty_seller = $mysoc;
+	}
 
 	dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '')."/country_code=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);
 
 	$vatratecleaned = $vatrate;
 	$reg = array();
-	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {
+		// If vat is "xx (yy)"
 	{
 		$vatratecleaned = trim($reg[1]);
+	}
 		$vatratecode = $reg[2];
 	}
 
@@ -4724,33 +5340,50 @@ 
 	}*/
 
 	// Some test to guess with no need to make database access
-	if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
+	if ($mysoc->country_code == 'ES') {
+		// For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
 	{
 		if ($local == 1)
 		{
 			if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") return 0;
+	}
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
-				if (!$thirdparty_buyer->localtax1_assuj) return 0;
+				if (!$thirdparty_buyer->localtax1_assuj) {
+					return 0;
+				}
 			} else {
-				if (!$thirdparty_seller->localtax1_assuj) return 0;
+				if (!$thirdparty_seller->localtax1_assuj) {
+					return 0;
+				}
 			}
 		}
 
 		if ($local == 2)
 		{
 			//if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
-			if (!$mysoc->localtax2_assuj) return 0; // If main vat is 0, IRPF may be different than 0.
+			if (!$mysoc->localtax2_assuj) {
+				return 0;
+			}
+			// If main vat is 0, IRPF may be different than 0.
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
-				if (!$thirdparty_buyer->localtax2_assuj) return 0;
+				if (!$thirdparty_buyer->localtax2_assuj) {
+					return 0;
+				}
 			} else {
-				if (!$thirdparty_seller->localtax2_assuj) return 0;
+				if (!$thirdparty_seller->localtax2_assuj) {
+					return 0;
+				}
 			}
 		}
 	} else {
-		if ($local == 1 && !$thirdparty_seller->localtax1_assuj) return 0;
-		if ($local == 2 && !$thirdparty_seller->localtax2_assuj) return 0;
+		if ($local == 1 && !$thirdparty_seller->localtax1_assuj) {
+			return 0;
+		}
+		if ($local == 2 && !$thirdparty_seller->localtax2_assuj) {
+			return 0;
+		}
 	}
 
 	// For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.
@@ -4766,27 +5399,33 @@ 
 		{
 			if ($thirdparty_seller != $mysoc)
 			{
-				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
+				if (!isOnlyOneLocalTax($local)) {
+					// TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
 				{
 					return $thirdparty_seller->localtax1_value;
 				}
+				}
 			} else // i am the seller
 			{
-				if (!isOnlyOneLocalTax($local))  // TODO If seller is me, why not always returning this, even if there is only one locatax vat.
+				if (!isOnlyOneLocalTax($local)) {
+					// TODO If seller is me, why not always returning this, even if there is only one locatax vat.
 				{
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX1;
 				}
+				}
 			}
 		}
 		if ($local == 2)
 		{
 			if ($thirdparty_seller != $mysoc)
 			{
-				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
+				if (!isOnlyOneLocalTax($local)) {
+					// TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
 				// TODO We should also return value defined on thirdparty only if defined
 				{
 					return $thirdparty_seller->localtax2_value;
 				}
+				}
 			} else // i am the seller
 			{
 				if (in_array($mysoc->country_code, array('ES')))
@@ -4804,16 +5443,24 @@ 
    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";
    	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-   	if ($vatratecode) $sql .= " AND t.code ='".$vatratecode."'"; // If we have the code, we use it in priority
-   	else $sql .= " AND t.recuperableonly ='".$vatnpr."'";
+   	if ($vatratecode) {
+   		$sql .= " AND t.code ='".$vatratecode."'";
+   	}
+   	// If we have the code, we use it in priority
+   	else {
+   		$sql .= " AND t.recuperableonly ='".$vatnpr."'";
+   	}
    	dol_syslog("get_localtax", LOG_DEBUG);
    	$resql = $db->query($sql);
 
    	if ($resql)
    	{
    		$obj = $db->fetch_object($resql);
-   		if ($local == 1) return $obj->localtax1;
-   		elseif ($local == 2) return $obj->localtax2;
+   		if ($local == 1) {
+   			return $obj->localtax1;
+   		} elseif ($local == 2) {
+   			return $obj->localtax2;
+   		}
 	}
 
 	return 0;
@@ -4862,8 +5509,11 @@ 
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($local == 1) return $obj->localtax1;
-		elseif ($local == 2) return $obj->localtax2;
+		if ($local == 1) {
+			return $obj->localtax1;
+		} elseif ($local == 2) {
+			return $obj->localtax2;
+		}
 	}
 
 	return 0;
@@ -4890,13 +5540,16 @@ 
 	// Search local taxes
 	$sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
-	else {
+	if ($firstparamisid) {
+		$sql .= " WHERE t.rowid = ".(int) $vatrate;
+	} else {
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {
+			// If vat is "xx (yy)"
 		{
 			$vatratecleaned = $reg[1];
+		}
 			$vatratecode = $reg[2];
 		}
 
@@ -4905,16 +5558,23 @@ 
 		else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";*/
 		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
 		$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql .= " AND t.code = '".$vatratecode."'";
+		if ($vatratecode) {
+			$sql .= " AND t.code = '".$vatratecode."'";
+		}
 	}
 
 	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
-		else return array();
-	} else dol_print_error($db);
+		if ($obj) {
+			return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
+		} else {
+			return array();
+		}
+	} else {
+		dol_print_error($db);
+	}
 
 	return array();
 }
@@ -4944,22 +5604,32 @@ 
 	// Search local taxes
 	$sql  = "SELECT t.taux as rate, t.code, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
-	else {
+	if ($firstparamisid) {
+		$sql .= " WHERE t.rowid = ".(int) $vatrate;
+	} else {
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
 		$reg = array();
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "x.x (yy)"
+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {
+			// If vat is "x.x (yy)"
 		{
 			$vatratecleaned = $reg[1];
+		}
 			$vatratecode = $reg[2];
 		}
 
 		$sql .= ", ".MAIN_DB_PREFIX."c_country as c";
-		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; // local tax in spain use the buyer country ??
-		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		if ($mysoc->country_code == 'ES') {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";
+		}
+		// local tax in spain use the buyer country ??
+		else {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		}
 		$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql .= " AND t.code = '".$vatratecode."'";
+		if ($vatratecode) {
+			$sql .= " AND t.code = '".$vatratecode."'";
+		}
 	}
 
 	$resql = $db->query($sql);
@@ -5008,16 +5678,22 @@ 
 		$product = new Product($db);
 		$result = $product->fetch($idprod);
 
-		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
+		if ($mysoc->country_code == $thirdparty_seller->country_code) {
+			// If selling country is ours
 		{
 			if ($idprodfournprice > 0)     // We want vat for product for a "supplier" object
 			{
 				$product->get_buyprice($idprodfournprice, 0, 0, 0);
+		}
 				$ret = $product->vatrate_supplier;
-				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
+				if ($product->default_vat_code) {
+					$ret .= ' ('.$product->default_vat_code.')';
+				}
 			} else {
 				$ret = $product->tva_tx; // Default vat of product we defined
-				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
+				if ($product->default_vat_code) {
+					$ret .= ' ('.$product->default_vat_code.')';
+				}
 			}
 			$found = 1;
 		} else {
@@ -5044,11 +5720,18 @@ 
 				if ($obj)
 				{
 					$ret = $obj->vat_rate;
-					if ($obj->default_vat_code) $ret .= ' ('.$obj->default_vat_code.')';
+					if ($obj->default_vat_code) {
+						$ret .= ' ('.$obj->default_vat_code.')';
+					}
 				}
 				$db->free($sql);
-			} else dol_print_error($db);
-		} else $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails
+			} else {
+				dol_print_error($db);
+			}
+		} else {
+			$ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+		}
+		// Forced value if autodetect fails
 	}
 
 	dol_syslog("get_product_vat_for_country: ret=".$ret);
@@ -5081,7 +5764,8 @@ 
 		$product = new Product($db);
 		$result = $product->fetch($idprod);
 
-		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
+		if ($mysoc->country_code == $thirdparty_seller->country_code) {
+			// If selling country is ours
 		{
 			/* Not defined yet, so we don't use this
 			if ($local==1) $ret=$product->localtax1_tx;
@@ -5097,6 +5781,7 @@ 
 	{
 		// If vat of product for the country not found or not defined, we return higher vat of country.
 		$sql = "SELECT taux as vat_rate, localtax1, localtax2";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";
 		$sql .= " ORDER BY t.taux DESC, t.recuperableonly ASC";
@@ -5108,10 +5793,15 @@ 
 			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				if ($local == 1) $ret = $obj->localtax1;
-				elseif ($local == 2) $ret = $obj->localtax2;
+				if ($local == 1) {
+					$ret = $obj->localtax1;
+				} elseif ($local == 2) {
+					$ret = $obj->localtax2;
+				}
 			}
-		} else dol_print_error($db);
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	dol_syslog("get_product_localtax_for_country: ret=".$ret);
@@ -5173,11 +5863,13 @@ 
 
 	// Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.
 	if (($seller_country_code == $buyer_country_code)
-	|| (in_array($seller_country_code, array('FR,MC')) && in_array($buyer_country_code, array('FR', 'MC')))) // Warning ->country_code not always defined
+	|| (in_array($seller_country_code, array('FR,MC')) && in_array($buyer_country_code, array('FR', 'MC')))) {
+		// Warning ->country_code not always defined
 	{
 		//print 'VATRULE 2';
 		return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
 	}
+	}
 
 	// Si (vendeur et acheteur dans Communaute europeenne) et (bien vendu = moyen de transports neuf comme auto, bateau, avion) alors TVA par defaut=0 (La TVA doit etre paye par l'acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
 	// Not supported
@@ -5261,24 +5953,38 @@ 
 {
 	global $mysoc;
 
-	if (!is_object($thirdparty_seller)) return -1;
-	if (!is_object($thirdparty_buyer)) return -1;
+	if (!is_object($thirdparty_seller)) {
+		return -1;
+	}
+	if (!is_object($thirdparty_buyer)) {
+		return -1;
+	}
 
-	if ($local == 1) // Localtax 1
+	if ($local == 1) {
+		// Localtax 1
 	{
 		if ($mysoc->country_code == 'ES')
 		{
 			if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) return 0;
+	}
 		} else {
 			// Si vendeur non assujeti a Localtax1, localtax1 par default=0
-			if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) return 0;
-			if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') return 0;
+			if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) {
+				return 0;
+			}
+			if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') {
+				return 0;
+			}
 		}
-	} elseif ($local == 2) //I Localtax 2
+	} elseif ($local == 2) {
+		//I Localtax 2
 	{
 		// Si vendeur non assujeti a Localtax2, localtax2 par default=0
 		if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) return 0;
-		if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') return 0;
+	}
+		if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') {
+			return 0;
+		}
 	}
 
 	if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code)
@@ -5301,25 +6007,44 @@ 
 {
 	global $langs;
 	$result = 'unknown'; $classname = '';
-	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') 	// A mettre avant test sur no a cause du == 0
+	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {
+		// A mettre avant test sur no a cause du == 0
 	{
 		$result = $langs->trans('yes');
-		if ($case == 1 || $case == 3) $result = $langs->trans("Yes");
-		if ($case == 2) $result = '<input type="checkbox" value="1" checked disabled>';
-		if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;
+	}
+		if ($case == 1 || $case == 3) {
+			$result = $langs->trans("Yes");
+		}
+		if ($case == 2) {
+			$result = '<input type="checkbox" value="1" checked disabled>';
+		}
+		if ($case == 3) {
+			$result = '<input type="checkbox" value="1" checked disabled> '.$result;
+		}
 
 		$classname = 'ok';
 	} elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
 	{
 		$result = $langs->trans("no");
-		if ($case == 1 || $case == 3) $result = $langs->trans("No");
-		if ($case == 2) $result = '<input type="checkbox" value="0" disabled>';
-		if ($case == 3) $result = '<input type="checkbox" value="0" disabled> '.$result;
+		if ($case == 1 || $case == 3) {
+			$result = $langs->trans("No");
+		}
+		if ($case == 2) {
+			$result = '<input type="checkbox" value="0" disabled>';
+		}
+		if ($case == 3) {
+			$result = '<input type="checkbox" value="0" disabled> '.$result;
+		}
 
-		if ($color == 2) $classname = 'ok';
-		else $classname = 'error';
+		if ($color == 2) {
+			$classname = 'ok';
+		} else {
+			$classname = 'error';
+		}
+	}
+	if ($color) {
+		return '<font class="'.$classname.'">'.$result.'</font>';
 	}
-	if ($color) return '<font class="'.$classname.'">'.$result.'</font>';
 	return $result;
 }
 
@@ -5345,16 +6070,27 @@ 
 	$path = '';
 
 	$arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');
-	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[] = 'product';
+	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+		$arrayforoldpath[] = 'product';
+	}
 	if (!empty($level) && in_array($modulepart, $arrayforoldpath))
 	{
 		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.
-		if (empty($alpha)) $num = preg_replace('/([^0-9])/i', '', $num);
-		else $num = preg_replace('/^.*\-/i', '', $num);
+		if (empty($alpha)) {
+			$num = preg_replace('/([^0-9])/i', '', $num);
+		} else {
+			$num = preg_replace('/^.*\-/i', '', $num);
+		}
 		$num = substr("000".$num, -$level);
-		if ($level == 1) $path = substr($num, 0, 1);
-		if ($level == 2) $path = substr($num, 1, 1).'/'.substr($num, 0, 1);
-		if ($level == 3) $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
+		if ($level == 1) {
+			$path = substr($num, 0, 1);
+		}
+		if ($level == 2) {
+			$path = substr($num, 1, 1).'/'.substr($num, 0, 1);
+		}
+		if ($level == 3) {
+			$path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
+		}
 	} else {
 		// TODO
 		// We will enhance here a common way of forging path for document storage
@@ -5367,7 +6103,9 @@ 
 		}
 	}
 
-	if (empty($withoutslash) && !empty($path)) $path .= '/';
+	if (empty($withoutslash) && !empty($path)) {
+		$path .= '/';
+	}
 
 	return $path;
 }
@@ -5387,7 +6125,9 @@ 
 	dol_syslog("functions.lib::dol_mkdir: dir=".$dir, LOG_INFO);
 
 	$dir_osencoded = dol_osencode($dir);
-	if (@is_dir($dir_osencoded)) return 0;
+	if (@is_dir($dir_osencoded)) {
+		return 0;
+	}
 
 	$nberr = 0;
 	$nbcreated = 0;
@@ -5403,9 +6143,15 @@ 
 	$num = count($cdir);
 	for ($i = 0; $i < $num; $i++)
 	{
-		if ($i > 0) $ccdir .= '/'.$cdir[$i];
-		else $ccdir .= $cdir[$i];
-		if (preg_match("/^.:$/", $ccdir, $regs)) continue; // Si chemin Windows incomplet, on poursuit par rep suivant
+		if ($i > 0) {
+			$ccdir .= '/'.$cdir[$i];
+		} else {
+			$ccdir .= $cdir[$i];
+		}
+		if (preg_match("/^.:$/", $ccdir, $regs)) {
+			continue;
+		}
+		// Si chemin Windows incomplet, on poursuit par rep suivant
 
 		// Attention, le is_dir() peut echouer bien que le rep existe.
 		// (ex selon config de open_basedir)
@@ -5469,7 +6215,9 @@ 
  */
 function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)
 {
-	if ($removelinefeed == 2) $stringtoclean = preg_replace('/<br[^>]*>(\n|\r)+/ims', '<br>', $stringtoclean);
+	if ($removelinefeed == 2) {
+		$stringtoclean = preg_replace('/<br[^>]*>(\n|\r)+/ims', '<br>', $stringtoclean);
+	}
 	$temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);
 
 	if ($strip_tags) {
@@ -5486,7 +6234,9 @@ 
 	$temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);
 
 	// Supprime aussi les retours
-	if ($removelinefeed == 1) $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+	if ($removelinefeed == 1) {
+		$temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+	}
 
 	// et les espaces doubles
 	while (strpos($temp, "  "))
@@ -5589,7 +6339,10 @@ 
 
 		$text = strtr($text, $repTable);
 		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-		else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
+		else {
+			$pattern = '/(<br[^>]*>)/U';
+		}
+		// /U is to have UNGREEDY regex to limit to one html tag.
 		$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 		$firstline = '';
@@ -5597,8 +6350,11 @@ 
 		$nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator
 		while (($i < $nba) && ($i < ($nboflines * 2)))
 		{
-			if ($i % 2 == 0) $firstline .= $a[$i];
-			elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) $firstline .= ($ishtml ? "<br>\n" : "\n");
+			if ($i % 2 == 0) {
+				$firstline .= $a[$i];
+			} elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+				$firstline .= ($ishtml ? "<br>\n" : "\n");
+			}
 			$i++;
 		}
 		unset($a);
@@ -5648,15 +6404,24 @@ 
 function dol_htmlentitiesbr($stringtoencode, $nl2brmode = 0, $pagecodefrom = 'UTF-8', $removelasteolbr = 1)
 {
 	$newstring = $stringtoencode;
-	if (dol_textishtml($stringtoencode))	// Check if text is already HTML or not
+	if (dol_textishtml($stringtoencode)) {
+		// Check if text is already HTML or not
 	{
-		$newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
-		if ($removelasteolbr) $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)
+		$newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring);
+	}
+	// Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
+		if ($removelasteolbr) {
+			$newstring = preg_replace('/<br>$/i', '', $newstring);
+		}
+		// Remove last <br> (remove only last one)
 		$newstring = strtr($newstring, array('&'=>'__and__', '<'=>'__lt__', '>'=>'__gt__', '"'=>'__dquot__'));
 		$newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding
 		$newstring = strtr($newstring, array('__and__'=>'&', '__lt__'=>'<', '__gt__'=>'>', '__dquot__'=>'"'));
 	} else {
-		if ($removelasteolbr) $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)
+		if ($removelasteolbr) {
+			$newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring);
+		}
+		// Remove last \n (may remove several)
 		$newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);
 	}
 	// Other substitutions that htmlentities does not do
@@ -5705,9 +6470,13 @@ 
 function dol_html_entity_decode($a, $b, $c = 'UTF-8', $keepsomeentities = 0)
 {
 	$newstring = $a;
-	if ($keepsomeentities) $newstring = strtr($newstring, array('&amp;'=>'__andamp__', '&lt;'=>'__andlt__', '&gt;'=>'__andgt__', '"'=>'__dquot__'));
+	if ($keepsomeentities) {
+		$newstring = strtr($newstring, array('&amp;'=>'__andamp__', '&lt;'=>'__andlt__', '&gt;'=>'__andgt__', '"'=>'__dquot__'));
+	}
 	$newstring = html_entity_decode($newstring, $b, $c);
-	if ($keepsomeentities) $newstring = strtr($newstring, array('__andamp__'=>'&amp;', '__andlt__'=>'&lt;', '__andgt__'=>'&gt;', '__dquot__'=>'"'));
+	if ($keepsomeentities) {
+		$newstring = strtr($newstring, array('__andamp__'=>'&amp;', '__andlt__'=>'&lt;', '__andgt__'=>'&gt;', '__dquot__'=>'"'));
+	}
 	return $newstring;
 }
 
@@ -5748,7 +6517,9 @@ 
 			$out .= $s[$scursor];
 		}
 	}
-	if ($clean) return $out;
+	if ($clean) {
+		return $out;
+	}
 	return $ok;
 }
 
@@ -5762,7 +6533,9 @@ 
  */
 function dol_nboflines($s, $maxchar = 0)
 {
-	if ($s == '') return 0;
+	if ($s == '') {
+		return 0;
+	}
 	$arraystring = explode("\n", $s);
 	$nb = count($arraystring);
 
@@ -5782,11 +6555,16 @@ 
 function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')
 {
 	$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
-	if (dol_textishtml($text)) $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+	if (dol_textishtml($text)) {
+		$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+	}
 
 	$text = strtr($text, $repTable);
 	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-	else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
+	else {
+		$pattern = '/(<br[^>]*>)/U';
+	}
+	// /U is to have UNGREEDY regex to limit to one html tag.
 	$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 	$nblines = (int) floor((count($a) + 1) / 2);
@@ -5824,25 +6602,51 @@ 
 {
 	if ($option == 1)
 	{
-		if (preg_match('/<html/i', $msg))				return true;
-		elseif (preg_match('/<body/i', $msg))			return true;
-		elseif (preg_match('/<\/textarea/i', $msg))	  return true;
-		elseif (preg_match('/<br/i', $msg))				return true;
+		if (preg_match('/<html/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<body/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<\/textarea/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<br/i', $msg)) {
+			return true;
+		}
 		return false;
 	} else {
-		if (preg_match('/<html/i', $msg))				return true;
-		elseif (preg_match('/<body/i', $msg))			return true;
-		elseif (preg_match('/<\/textarea/i', $msg))	  return true;
-		elseif (preg_match('/<(b|em|i|u)>/i', $msg))		return true;
-		elseif (preg_match('/<br\/>/i', $msg))	  return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) 	  return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) return true;
-		elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) return true; // must accept <img src="http://example.com/aaa.png" />
-		elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) return true; // must accept <a href="http://example.com/aaa.png" />
-		elseif (preg_match('/<h[0-9]>/i', $msg))			return true;
-		elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))	return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
-		elseif (preg_match('/&#[0-9]{2,3};/i', $msg))	return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
+		if (preg_match('/<html/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<body/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<\/textarea/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<(b|em|i|u)>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<br\/>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {
+			return true;
+		}
+		// must accept <img src="http://example.com/aaa.png" />
+		elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) {
+			return true;
+		}
+		// must accept <a href="http://example.com/aaa.png" />
+		elseif (preg_match('/<h[0-9]>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {
+			return true;
+		}
+		// Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
+		elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {
+			return true;
+		}
+		// Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
 
 		return false;
 	}
@@ -6045,10 +6849,14 @@ 
 			if ($object->id > 0)
 			{
 				$substitutionarray['__MEMBER_ID__'] = $object->id;
-				if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+				if (method_exists($object, 'getCivilityLabel')) {
+					$substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+				}
 				$substitutionarray['__MEMBER_FIRSTNAME__'] = $object->firstname;
 				$substitutionarray['__MEMBER_LASTNAME__'] = $object->lastname;
-				if (method_exists($object, 'getFullName')) $substitutionarray['__MEMBER_FULLNAME__'] = $object->getFullName($outputlangs);
+				if (method_exists($object, 'getFullName')) {
+					$substitutionarray['__MEMBER_FULLNAME__'] = $object->getFullName($outputlangs);
+				}
 				$substitutionarray['__MEMBER_COMPANY__'] = $object->societe;
 				$substitutionarray['__MEMBER_ADDRESS__'] = $object->address;
 				$substitutionarray['__MEMBER_ZIP__'] = $object->zip;
@@ -6126,9 +6934,11 @@ 
 				$substitutionarray['__PROJECT_REF__'] = (is_object($object->project) ? $object->project->ref : '');
 				$substitutionarray['__PROJECT_NAME__'] = (is_object($object->project) ? $object->project->title : '');
 			}
-			if (is_object($object->projet) && $object->projet->id > 0)	// Deprecated, for backward compatibility
+			if (is_object($object->projet) && $object->projet->id > 0) {
+				// Deprecated, for backward compatibility
 			{
 				$substitutionarray['__PROJECT_ID__'] = (is_object($object->projet) ? $object->projet->id : '');
+			}
 				$substitutionarray['__PROJECT_REF__'] = (is_object($object->projet) ? $object->projet->ref : '');
 				$substitutionarray['__PROJECT_NAME__'] = (is_object($object->projet) ? $object->projet->title : '');
 			}
@@ -6147,8 +6957,12 @@ 
 					$datenextexpiration = '';
 					foreach ($object->lines as $line)
 					{
-						if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
-						if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
+						if ($line->date_ouverture_prevue > $dateplannedstart) {
+							$dateplannedstart = $line->date_ouverture_prevue;
+						}
+						if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+							$datenextexpiration = $line->date_fin_prevue;
+						}
 					}
 					$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
 					$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
@@ -6160,7 +6974,9 @@ 
 			// Create dynamic tags for __EXTRAFIELD_FIELD__
 			if ($object->table_element && $object->id > 0)
 			{
-				if (!is_object($extrafields)) $extrafields = new ExtraFields($db);
+				if (!is_object($extrafields)) {
+					$extrafields = new ExtraFields($db);
+				}
 				$extrafields->fetch_name_optionals_label($object->table_element, true);
 
 				if ($object->fetch_optionals() > 0)
@@ -6195,9 +7011,15 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 				$outputlangs->loadLangs(array('paypal', 'other'));
 				$typeforonlinepayment = 'free';
-				if (is_object($object) && $object->element == 'commande') $typeforonlinepayment = 'order';
-				if (is_object($object) && $object->element == 'facture')  $typeforonlinepayment = 'invoice';
-				if (is_object($object) && $object->element == 'member')   $typeforonlinepayment = 'member';
+				if (is_object($object) && $object->element == 'commande') {
+					$typeforonlinepayment = 'order';
+				}
+				if (is_object($object) && $object->element == 'facture') {
+					$typeforonlinepayment = 'invoice';
+				}
+				if (is_object($object) && $object->element == 'member') {
+					$typeforonlinepayment = 'member';
+				}
 				$url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);
 				$paymenturl = $url;
 			}
@@ -6210,19 +7032,31 @@ 
 				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
-				} else $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+				} else {
+					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+				}
 				if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);
-				} else $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+				} else {
+					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+				}
 				if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);
-				} else $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+				} else {
+					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+				}
 
-				if (is_object($object) && $object->element == 'propal') $substitutionarray['__URL_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/comm/propal/card.php?id=".$object->id;
-				if (is_object($object) && $object->element == 'commande') $substitutionarray['__URL_ORDER__'] = DOL_MAIN_URL_ROOT."/commande/card.php?id=".$object->id;
-				if (is_object($object) && $object->element == 'facture') $substitutionarray['__URL_INVOICE__'] = DOL_MAIN_URL_ROOT."/compta/facture/card.php?id=".$object->id;
+				if (is_object($object) && $object->element == 'propal') {
+					$substitutionarray['__URL_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/comm/propal/card.php?id=".$object->id;
+				}
+				if (is_object($object) && $object->element == 'commande') {
+					$substitutionarray['__URL_ORDER__'] = DOL_MAIN_URL_ROOT."/commande/card.php?id=".$object->id;
+				}
+				if (is_object($object) && $object->element == 'facture') {
+					$substitutionarray['__URL_INVOICE__'] = DOL_MAIN_URL_ROOT."/compta/facture/card.php?id=".$object->id;
+				}
 			}
 		}
 	}
@@ -6234,14 +7068,22 @@ 
 		$substitutionarray['__AMOUNT__']          = is_object($object) ? $object->total_ttc : '';
 		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';
 		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';
-		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object) ? $object->total_localtax1 : '';
-		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object) ? $object->total_localtax2 : '';
+		if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+			$substitutionarray['__AMOUNT_TAX2__']     = is_object($object) ? $object->total_localtax1 : '';
+		}
+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+			$substitutionarray['__AMOUNT_TAX3__']     = is_object($object) ? $object->total_localtax2 : '';
+		}
 
 		$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object) ? ($object->total_ttc ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
 		$substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? ($object->total_ht ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
 		$substitutionarray['__AMOUNT_VAT_FORMATED__']      = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency) : ($object->total_tva ? price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency) : null)) : '';
-		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
-		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object) ? ($object->total_localtax2 ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
+		if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+			$substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
+		}
+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+			$substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object) ? ($object->total_localtax2 ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
+		}
 
 		// TODO Add keys for foreign multicurrency
 
@@ -6317,9 +7159,13 @@ 
 {
 	global $conf, $langs;
 
-	if (!is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+	if (!is_array($substitutionarray)) {
+		return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+	}
 
-	if (empty($outputlangs)) $outputlangs = $langs;
+	if (empty($outputlangs)) {
+		$outputlangs = $langs;
+	}
 
 	// Make substitution for language keys: __(AnyTranslationKey)__ or __(AnyTranslationKey|langfile)__
 	if (is_object($outputlangs))
@@ -6328,11 +7174,15 @@ 
 		while (preg_match('/__\(([^\)]+)\)__/', $text, $reg))
 		{
 			$msgishtml = 0;
-			if (dol_textishtml($text, 1)) $msgishtml = 1;
+			if (dol_textishtml($text, 1)) {
+				$msgishtml = 1;
+			}
 
 			// If key is __(TranslationKey|langfile)__, then force load of langfile.lang
 			$tmp = explode('|', $reg[1]);
-			if (!empty($tmp[1])) $outputlangs->load($tmp[1]);
+			if (!empty($tmp[1])) {
+				$outputlangs->load($tmp[1]);
+			}
 
 			$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);
 		}
@@ -6344,21 +7194,35 @@ 
 	while (preg_match('/__\[([^\]]+)\]__/', $text, $reg))
 	{
 		$msgishtml = 0;
-		if (dol_textishtml($text, 1)) $msgishtml = 1;
+		if (dol_textishtml($text, 1)) {
+			$msgishtml = 1;
+		}
 
 		$keyfound = $reg[1];
-		if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
-		else $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
+		if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $keyfound)) {
+			$newval = '*****forbidden*****';
+		} else {
+			$newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
+		}
 		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ?dol_htmlentitiesbr($newval) : $newval, $text);
 	}
 
 	// Make substitition for array $substitutionarray
 	foreach ($substitutionarray as $key => $value)
 	{
-		if (!isset($value)) continue; // If value is null, it same than not having substitution key at all into array, we do not replace.
+		if (!isset($value)) {
+			continue;
+		}
+		// If value is null, it same than not having substitution key at all into array, we do not replace.
 
-		if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value = ''; // Protection
-		if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value = ''; // Protection
+		if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+			$value = '';
+		}
+		// Protection
+		if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+			$value = '';
+		}
+		// Protection
 
 		$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
 	}
@@ -6405,7 +7269,9 @@ 
 		$dir = dol_buildpath($reldir, 0);
 
 		// Check if directory exists
-		if (!dol_is_dir($dir)) continue;
+		if (!dol_is_dir($dir)) {
+			continue;
+		}
 
 		$substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');
 		foreach ($substitfiles as $substitfile)
@@ -6419,7 +7285,9 @@ 
 				require_once $dir.$substitfile['name'];
 				// Call the user's function, and only if it is defined
 				$function_name = $module."_".$callfunc;
-				if (function_exists($function_name)) $function_name($substitutionarray, $outputlangs, $object, $parameters);
+				if (function_exists($function_name)) {
+					$function_name($substitutionarray, $outputlangs, $object, $parameters);
+				}
 			}
 		}
 	}
@@ -6455,7 +7323,9 @@ 
 
 	$out = '';
 
-	if (!is_object($outputlangs)) $outputlangs = $langs;
+	if (!is_object($outputlangs)) {
+		$outputlangs = $langs;
+	}
 
 	if ($date_start && $date_end)
 	{
@@ -6487,11 +7357,15 @@ 
 
 	$ret = '';
 	// If order not defined, we use the setup
-	if ($nameorder < 0) $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+	if ($nameorder < 0) {
+		$nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+	}
 	if ($nameorder && $nameorder != 2 && $nameorder != 3)
 	{
 		$ret .= $firstname;
-		if ($firstname && $lastname) $ret .= ' ';
+		if ($firstname && $lastname) {
+			$ret .= ' ';
+		}
 		$ret .= $lastname;
 	} elseif ($nameorder == 2 || $nameorder == 3)
 	{
@@ -6502,7 +7376,9 @@ 
 	    }
 	} else {
 		$ret .= $lastname;
-		if ($firstname && $lastname) $ret .= ' ';
+		if ($firstname && $lastname) {
+			$ret .= ' ';
+		}
 		$ret .= $firstname;
 	}
 	return $ret;
@@ -6522,14 +7398,18 @@ 
 function setEventMessage($mesgs, $style = 'mesgs')
 {
 	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function
-	if (!is_array($mesgs))		// If mesgs is a string
+	if (!is_array($mesgs)) {
+		// If mesgs is a string
 	{
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
+	}
 	} else // If mesgs is an array
 	{
 		foreach ($mesgs as $mesg)
 		{
-			if ($mesg) $_SESSION['dol_events'][$style][] = $mesg;
+			if ($mesg) {
+				$_SESSION['dol_events'][$style][] = $mesg;
+			}
 		}
 	}
 }
@@ -6559,10 +7439,16 @@ 
 		}
 		if (empty($messagekey) || empty($_COOKIE["DOLHIDEMESSAGE".$messagekey]))
 		{
-			if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');
-			if (empty($mesgs)) setEventMessage($mesg, $style);
-			else {
-				if (!empty($mesg) && !in_array($mesg, $mesgs)) setEventMessage($mesg, $style); // Add message string if not already into array
+			if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
+				dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');
+			}
+			if (empty($mesgs)) {
+				setEventMessage($mesg, $style);
+			} else {
+				if (!empty($mesg) && !in_array($mesg, $mesgs)) {
+					setEventMessage($mesg, $style);
+				}
+				// Add message string if not already into array
 				setEventMessage($mesgs, $style);
 			}
 		}
@@ -6582,19 +7468,25 @@ 
 {
 	// Show mesgs
 	if (isset($_SESSION['dol_events']['mesgs'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+		}
 		unset($_SESSION['dol_events']['mesgs']);
 	}
 
 	// Show errors
 	if (isset($_SESSION['dol_events']['errors'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+		}
 		unset($_SESSION['dol_events']['errors']);
 	}
 
 	// Show warnings
 	if (isset($_SESSION['dol_events']['warnings'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+		}
 		unset($_SESSION['dol_events']['warnings']);
 	}
 }
@@ -6638,7 +7530,9 @@ 
 			{
 				$ret++;
 				$out .= $langs->trans($message);
-				if ($ret < count($mesgarray)) $out .= "<br>\n";
+				if ($ret < count($mesgarray)) {
+					$out .= "<br>\n";
+				}
 			}
 		}
 		if ($mesgstring)
@@ -6707,7 +7601,9 @@ 
  */
 function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'ok', $keepembedded = 0)
 {
-	if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) return;
+	if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) {
+		return;
+	}
 
 	$iserror = 0;
 	$iswarning = 0;
@@ -6718,10 +7614,17 @@ 
 			if ($val && preg_match('/class="error"/i', $val)) { $iserror++; break; }
 			if ($val && preg_match('/class="warning"/i', $val)) { $iswarning++; break; }
 		}
-	} elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) $iserror++;
-	elseif ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) $iswarning++;
-	if ($style == 'error') $iserror++;
-	if ($style == 'warning') $iswarning++;
+	} elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) {
+		$iserror++;
+	} elseif ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) {
+		$iswarning++;
+	}
+	if ($style == 'error') {
+		$iserror++;
+	}
+	if ($style == 'warning') {
+		$iswarning++;
+	}
 
 	if ($iserror || $iswarning)
 	{
@@ -6748,8 +7651,10 @@ 
 			$mesgarray = $newmesgarray;
 		}
 		print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);
-	} else print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
-}
+	} else {
+		print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+	}
+	}
 
 /**
  *  Print formated error messages to output (Used to show messages on html output).
@@ -6805,7 +7710,9 @@ 
                 ($order == 'asc') ? asort($temp) : arsort($temp);
             } else {
                 ($case_sensitive) ? natsort($temp) : natcasesort($temp);
-                if ($order != 'asc') $temp = array_reverse($temp, true);
+                if ($order != 'asc') {
+                	$temp = array_reverse($temp, true);
+                }
             }
 
 			$sorted = array();
@@ -6834,17 +7741,39 @@ 
 	$strLength = dol_strlen($str);
 	for ($i = 0; $i < $strLength; $i++)
 	{
-		if (ord($str[$i]) < 0x80) continue; // 0bbbbbbb
-		elseif ((ord($str[$i]) & 0xE0) == 0xC0) $n = 1; // 110bbbbb
-		elseif ((ord($str[$i]) & 0xF0) == 0xE0) $n = 2; // 1110bbbb
-		elseif ((ord($str[$i]) & 0xF8) == 0xF0) $n = 3; // 11110bbb
-		elseif ((ord($str[$i]) & 0xFC) == 0xF8) $n = 4; // 111110bb
-		elseif ((ord($str[$i]) & 0xFE) == 0xFC) $n = 5; // 1111110b
-		else return false; // Does not match any model
-		for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?
-			if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))
+		if (ord($str[$i]) < 0x80) {
+			continue;
+		}
+		// 0bbbbbbb
+		elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+			$n = 1;
+		}
+		// 110bbbbb
+		elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+			$n = 2;
+		}
+		// 1110bbbb
+		elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+			$n = 3;
+		}
+		// 11110bbb
+		elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+			$n = 4;
+		}
+		// 111110bb
+		elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+			$n = 5;
+		}
+		// 1111110b
+		else {
 			return false;
 		}
+		// Does not match any model
+		for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?
+			if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+						return false;
+			}
+		}
 	}
 	return true;
 }
@@ -6859,9 +7788,14 @@ 
 {
 	if (function_exists('mb_check_encoding')) {
 		//if (mb_detect_encoding($str, 'ASCII', true) return false;
-		if (!mb_check_encoding($str, 'ASCII')) return false;
+		if (!mb_check_encoding($str, 'ASCII')) {
+			return false;
+		}
 	} else {
-		if (preg_match('/[^\x00-\x7f]/', $str)) return false; // Contains a byte > 7f
+		if (preg_match('/[^\x00-\x7f]/', $str)) {
+			return false;
+		}
+		// Contains a byte > 7f
 	}
 
 	return true;
@@ -6880,11 +7814,21 @@ 
 	global $conf;
 
 	$tmp = ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0
-	if (empty($tmp) && !empty($_SERVER["WINDIR"])) $tmp = 'iso-8859-1'; // By default for windows
-	if (empty($tmp)) $tmp = 'utf-8'; // By default for other
-	if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
+	if (empty($tmp) && !empty($_SERVER["WINDIR"])) {
+		$tmp = 'iso-8859-1';
+	}
+	// By default for windows
+	if (empty($tmp)) {
+		$tmp = 'utf-8';
+	}
+	// By default for other
+	if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING)) {
+		$tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
+	}
 
-	if ($tmp == 'iso-8859-1') return utf8_decode($str);
+	if ($tmp == 'iso-8859-1') {
+		return utf8_decode($str);
+	}
 	return $str;
 }
 
@@ -6907,12 +7851,17 @@ 
 	global $cache_codes;
 
 	// If key empty
-	if ($key == '') return '';
+	if ($key == '') {
+		return '';
+	}
 
 	// Check in cache
-	if (isset($cache_codes[$tablename][$key][$fieldid]))	// Can be defined to 0 or ''
+	if (isset($cache_codes[$tablename][$key][$fieldid])) {
+		// Can be defined to 0 or ''
 	{
-		return $cache_codes[$tablename][$key][$fieldid]; // Found in cache
+		return $cache_codes[$tablename][$key][$fieldid];
+	}
+	// Found in cache
 	}
 
 	dol_syslog('dol_getIdFromCode (value for field '.$fieldid.' from key '.$key.' not found into cache)', LOG_DEBUG);
@@ -6920,15 +7869,19 @@ 
 	$sql = "SELECT ".$fieldid." as valuetoget";
 	$sql .= " FROM ".MAIN_DB_PREFIX.$tablename;
 	$sql .= " WHERE ".$fieldkey." = '".$db->escape($key)."'";
-	if (!empty($entityfilter))
-		$sql .= " AND entity IN (".getEntity($tablename).")";
+	if (!empty($entityfilter)) {
+			$sql .= " AND entity IN (".getEntity($tablename).")";
+	}
 
 	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
-		else $cache_codes[$tablename][$key][$fieldid] = '';
+		if ($obj) {
+			$cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
+		} else {
+			$cache_codes[$tablename][$key][$fieldid] = '';
+		}
 		$db->free($resql);
 		return $cache_codes[$tablename][$key][$fieldid];
 	} else {
@@ -6982,11 +7935,17 @@ 
 	//print $s."<br>\n";
 	if ($returnvalue)
 	{
-		if ($hideerrors) return @eval('return '.$s.';');
-		else return eval('return '.$s.';');
+		if ($hideerrors) {
+			return @eval('return '.$s.';');
+		} else {
+			return eval('return '.$s.';');
+		}
 	} else {
-		if ($hideerrors) @eval($s);
-		else eval($s);
+		if ($hideerrors) {
+			@eval($s);
+		} else {
+			eval($s);
+		}
 	}
 }
 
@@ -7012,7 +7971,9 @@ 
 {
 	global $langs;
 
-	if (empty($codelang)) return '';
+	if (empty($codelang)) {
+		return '';
+	}
 
 	if ($codelang == 'auto')
 	{
@@ -7027,8 +7988,9 @@ 
 		'sv_SV' => 'se'
 	);
 
-	if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];
-	else {
+	if (isset($langtocountryflag[$codelang])) {
+		$flagImage = $langtocountryflag[$codelang];
+	} else {
 		$tmparray = explode('_', $codelang);
 		$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
 	}
@@ -7047,14 +8009,25 @@ 
 {
 	global $mysoc;
 
-	if (empty($countrycode)) return null;
+	if (empty($countrycode)) {
+		return null;
+	}
 
-	if (strtoupper($countrycode) == 'MQ') return 'fr_CA';
-	if (strtoupper($countrycode) == 'SE') return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country
+	if (strtoupper($countrycode) == 'MQ') {
+		return 'fr_CA';
+	}
+	if (strtoupper($countrycode) == 'SE') {
+		return 'sv_SE';
+	}
+	// se_SE is Sami/Sweden, and we want in priority sv_SE for SE country
 	if (strtoupper($countrycode) == 'CH')
 	{
-		if ($mysoc->country_code == 'FR') return 'fr_CH';
-		if ($mysoc->country_code == 'DE') return 'de_CH';
+		if ($mysoc->country_code == 'FR') {
+			return 'fr_CH';
+		}
+		if ($mysoc->country_code == 'DE') {
+			return 'de_CH';
+		}
 	}
 
 	// Locale list taken from:
@@ -7232,13 +8205,17 @@ 
 	);
 
 	$buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);
-	if (in_array($buildprimarykeytotest, $locales)) return strtolower($countrycode).'_'.strtoupper($countrycode);
+	if (in_array($buildprimarykeytotest, $locales)) {
+		return strtolower($countrycode).'_'.strtoupper($countrycode);
+	}
 
-	if (function_exists('locale_get_primary_language') && function_exists('locale_get_region'))    // Need extension php-intl
+	if (function_exists('locale_get_primary_language') && function_exists('locale_get_region')) {
+		// Need extension php-intl
 	{
 	    foreach ($locales as $locale)
     	{
     		$locale_language = locale_get_primary_language($locale);
+	}
     		$locale_region = locale_get_region($locale);
     		if (strtoupper($countrycode) == $locale_region)
     		{
@@ -7294,37 +8271,51 @@ 
 
 			if ($mode == 'add' && !preg_match('/^\-/', $values[1]))
 			{
-				if (count($values) == 6)       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
+				if (count($values) == 6) {
+					// new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
 				{
 					if ($values[0] != $type) continue;
+				}
 
 					if (verifCond($values[4]))
 					{
-						if ($values[3]) $langs->load($values[3]);
+						if ($values[3]) {
+							$langs->load($values[3]);
+						}
 						if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg))
 						{
 							$substitutionarray = array();
 							complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 							$label = make_substitutions($reg[1], $substitutionarray);
-						} else $label = $langs->trans($values[2]);
+						} else {
+							$label = $langs->trans($values[2]);
+						}
 
 						$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);
 						$head[$h][1] = $label;
 						$head[$h][2] = str_replace('+', '', $values[1]);
 						$h++;
 					}
-				} elseif (count($values) == 5)       // deprecated
+				} elseif (count($values) == 5) {
+					// deprecated
 				{
 					dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);
+				}
 
-					if ($values[0] != $type) continue;
-					if ($values[3]) $langs->load($values[3]);
+					if ($values[0] != $type) {
+						continue;
+					}
+					if ($values[3]) {
+						$langs->load($values[3]);
+					}
 					if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg))
 					{
 						$substitutionarray = array();
 						complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 						$label = make_substitutions($reg[1], $substitutionarray);
-					} else $label = $langs->trans($values[2]);
+					} else {
+						$label = $langs->trans($values[2]);
+					}
 
 					$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);
 					$head[$h][1] = $label;
@@ -7333,7 +8324,9 @@ 
 				}
 			} elseif ($mode == 'remove' && preg_match('/^\-/', $values[1]))
 			{
-				if ($values[0] != $type) continue;
+				if ($values[0] != $type) {
+					continue;
+				}
 				$tabname = str_replace('-', '', $values[1]);
 				foreach ($head as $key => $val)
 				{
@@ -7379,8 +8372,11 @@ 
 	global $action;
 	global $micro_start_time;
 
-	if ($zone == 'private') print "\n".'<!-- Common footer for private page -->'."\n";
-	else print "\n".'<!-- Common footer for public page -->'."\n";
+	if ($zone == 'private') {
+		print "\n".'<!-- Common footer for private page -->'."\n";
+	} else {
+		print "\n".'<!-- Common footer for public page -->'."\n";
+	}
 
 	// A div to store page_y POST parameter so we can read it using javascript
 	print "\n<!-- A div to store page_y POST parameter -->\n";
@@ -7390,7 +8386,9 @@ 
 	$reshook = $hookmanager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks
 	if (empty($reshook))
 	{
-		if (!empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
+		if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+			print $conf->global->MAIN_HTML_FOOTER."\n";
+		}
 
 		print "\n";
 		if (!empty($conf->use_javascript_ajax))
@@ -7415,7 +8413,9 @@ 
 				print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */'."\n";
 				$relativepathstring = $_SERVER["PHP_SELF"];
 				// Clean $relativepathstring
-				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+				if (constant('DOL_URL_ROOT')) {
+					$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+				}
 				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 				//$tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
@@ -7432,11 +8432,17 @@ 
 							{
 								$tmpquerytohaveparam = explode('=', $tmpquerytohave);
 								//print "console.log('".$tmpquerytohaveparam[0]." ".$tmpquerytohaveparam[1]." ".GETPOST($tmpquerytohaveparam[0])."');";
-								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) $foundintru = 1;
+								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) {
+									$foundintru = 1;
+								}
+							}
+							if (!$foundintru) {
+								$qualified = 1;
 							}
-							if (!$foundintru) $qualified = 1;
 							//var_dump($defkey.'-'.$qualified);
-						} else $qualified = 1;
+						} else {
+							$qualified = 1;
+						}
 
 						if ($qualified)
 						{
@@ -7463,11 +8469,17 @@ 
 							{
 								$tmpquerytohaveparam = explode('=', $tmpquerytohave);
 								//print "console.log('".$tmpquerytohaveparam[0]." ".$tmpquerytohaveparam[1]." ".GETPOST($tmpquerytohaveparam[0])."');";
-								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) $foundintru = 1;
+								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) {
+									$foundintru = 1;
+								}
+							}
+							if (!$foundintru) {
+								$qualified = 1;
 							}
-							if (!$foundintru) $qualified = 1;
 							//var_dump($defkey.'-'.$qualified);
-						} else $qualified = 1;
+						} else {
+							$qualified = 1;
+						}
 
 						if ($qualified)
 						{
@@ -7491,11 +8503,15 @@ 
 				print "\n";
 				print "/* JS CODE TO ENABLE to add memory info */\n";
 				print 'window.console && console.log("';
-				if (!empty($conf->global->MEMCACHED_SERVER)) print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
+				if (!empty($conf->global->MEMCACHED_SERVER)) {
+					print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
+				}
 				print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED) ? $conf->global->MAIN_OPTIMIZE_SPEED : 'off');
-				if (!empty($micro_start_time))   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
+				if (!empty($micro_start_time)) {
+					// Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
 				{
 					$micro_end_time = microtime(true);
+				}
 					print ' - Build time: '.ceil(1000 * ($micro_end_time - $micro_start_time)).' ms';
 				}
 
@@ -7549,9 +8565,11 @@ 
 	        $debugbar['time']->stopMeasure('pageaftermaster');
 	        print '<!-- Output debugbar data -->'."\n";
 		    print $debugbar->getRenderer()->render();
-		} elseif (count($conf->logbuffer))    // If there is some logs in buffer to show
+		} elseif (count($conf->logbuffer)) {
+			// If there is some logs in buffer to show
 		{
 			print "\n";
+		}
 			print "<!-- Start of log output\n";
 			//print '<div class="hidden">'."\n";
 			foreach ($conf->logbuffer as $logline)
@@ -7658,7 +8676,9 @@ 
 
 	$crits = explode(' ', $value);
 	$res = '';
-	if (!is_array($fields)) $fields = array($fields);
+	if (!is_array($fields)) {
+		$fields = array($fields);
+	}
 
 	$nboffields = count($fields);
 	$end2 = count($crits);
@@ -7694,7 +8714,9 @@ 
 			} elseif ($mode == 2 || $mode == -2)
 			{
 				$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '')."IN (".$db->escape(trim($crit)).")";
-				if ($mode == -2) $newres .= ' OR '.$field.' IS NULL';
+				if ($mode == -2) {
+					$newres .= ' OR '.$field.' IS NULL';
+				}
 				$i2++; // a criteria was added to string
 			} elseif ($mode == 3 || $mode == -3)
 			{
@@ -7713,7 +8735,9 @@ 
 					$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$listofcodes.")";
 					$i2++; // a criteria was added to string
 				}
-				if ($mode == -3) $newres .= ' OR '.$field.' IS NULL';
+				if ($mode == -3) {
+					$newres .= ' OR '.$field.' IS NULL';
+				}
 			} elseif ($mode == 4)
 			{
 			    $tmparray = explode(',', trim($crit));
@@ -7739,13 +8763,17 @@ 
 				$i3 = 0;
 				foreach ($tmpcrits as $tmpcrit)
 				{
-                    if ($tmpcrit !== '0' && empty($tmpcrit)) continue;
+                    if ($tmpcrit !== '0' && empty($tmpcrit)) {
+                    	continue;
+                    }
 
 					$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
 
-					if (preg_match('/\.(id|rowid)$/', $field))	// Special case for rowid that is sometimes a ref so used as a search field
+					if (preg_match('/\.(id|rowid)$/', $field)) {
+						// Special case for rowid that is sometimes a ref so used as a search field
 					{
 						$newres .= $field." = ".(is_numeric(trim($tmpcrit)) ?trim($tmpcrit) : '0');
+					}
 					} else {
 						$newres .= $field." LIKE '";
 
@@ -7778,7 +8806,9 @@ 
 			}
 			$i++;
 		}
-		if ($newres) $res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');
+		if ($newres) {
+			$res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');
+		}
 		$j++;
 	}
 	$res = ($nofirstand ? "" : " AND ")."(".$res.")";
@@ -7819,22 +8849,40 @@ 
 function getImageFileNameForSize($file, $extName, $extImgTarget = '')
 {
 	$dirName = dirname($file);
-	if ($dirName == '.') $dirName = '';
+	if ($dirName == '.') {
+		$dirName = '';
+	}
 
 	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp|\.webp)$/i', '', $file); // We remove extension, whatever is its case
 	$fileName = basename($fileName);
 
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.webp$/i', $file) ? '.webp' : '');
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.webp$/i', $file) ? '.webp' : '');
+	}
 
-	if (!$extImgTarget) return $file;
+	if (!$extImgTarget) {
+		return $file;
+	}
 
 	$subdir = '';
-	if ($extName) $subdir = 'thumbs/';
+	if ($extName) {
+		$subdir = 'thumbs/';
+	}
 
 	return ($dirName ? $dirName.'/' : '').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb
 }
@@ -7853,7 +8901,9 @@ 
 {
 	global $conf, $langs;
 
-	if (empty($conf->use_javascript_ajax)) return '';
+	if (empty($conf->use_javascript_ajax)) {
+		return '';
+	}
 
 	$mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml', 'webp');
 	//$mime_preview[]='vnd.oasis.opendocument.presentation';
@@ -7862,14 +8912,20 @@ 
 
 	if ($alldata == 1)
 	{
-		if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), 'mime'=>dol_mimetype($relativepath),);
-		else return array();
+		if ($num_mime !== false) {
+			return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), 'mime'=>dol_mimetype($relativepath),);
+		} else {
+			return array();
+		}
 	}
 
 	// old behavior
-	if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
-	else return '';
-}
+	if ($num_mime !== false) {
+		return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
+	} else {
+		return '';
+	}
+	}
 
 
 /**
@@ -7887,7 +8943,9 @@ 
 				    jQuery("'.((strpos($htmlname, '.') === 0 ? '' : '#').$htmlname).'").click(function() { jQuery(this).select(); } );
 				});
 		    </script>';
-	if ($addlink) $out .= ' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+	if ($addlink) {
+		$out .= ' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+	}
 	return $out;
 }
 
@@ -8029,7 +9087,9 @@ 
 	{
 		$dictvalues[$tablename] = array();
 		$sql = 'SELECT * FROM '.$tablename.' WHERE 1'; // Here select * is allowed as it is generic code and we don't have list of fields
-		if ($checkentity) $sql .= ' AND entity IN (0,'.getEntity($tablename).')';
+		if ($checkentity) {
+			$sql .= ' AND entity IN (0,'.getEntity($tablename).')';
+		}
 
 		$resql = $db->query($sql);
 		if ($resql)
@@ -8043,10 +9103,15 @@ 
 		}
 	}
 
-	if (!empty($dictvalues[$tablename][$id])) return $dictvalues[$tablename][$id]->{$field}; // Found
+	if (!empty($dictvalues[$tablename][$id])) {
+		return $dictvalues[$tablename][$id]->{$field};
+	}
+	// Found
 	else // Not found
 	{
-		if ($id > 0) return $id;
+		if ($id > 0) {
+			return $id;
+		}
 		return '';
 	}
 }
@@ -8065,9 +9130,11 @@ 
 	{
 		$res = 0;
 		$tmp = explode(',', $stringcolor);
-		if (count($tmp) > 1)   // This is a comma RGB ('255','255','255')
+		if (count($tmp) > 1) {
+			// This is a comma RGB ('255','255','255')
 		{
 			$r = $tmp[0];
+		}
 			$g = $tmp[1];
 			$b = $tmp[2];
 		} else {
@@ -8079,7 +9146,9 @@ 
 			$b = hexdec($hexb);
 		}
 		$bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0; // HSL algorithm
-		if ($bright > 0.6) $res = 1;
+		if ($bright > 0.6) {
+			$res = 1;
+		}
 	}
 	return $res;
 }
@@ -8098,7 +9167,10 @@ 
 
 	//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
 	//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-	if (empty($menuentry['enabled'])) return 0; // Entry disabled by condition
+	if (empty($menuentry['enabled'])) {
+		return 0;
+	}
+	// Entry disabled by condition
 	if ($type_user && $menuentry['module'])
 	{
 		$tmploops = explode('|', $menuentry['module']);
@@ -8109,11 +9181,23 @@ 
 				$found++; break;
 			}
 		}
-		if (!$found) return 0; // Entry is for menus all excluded to external users
+		if (!$found) {
+			return 0;
+		}
+		// Entry is for menus all excluded to external users
+	}
+	if (!$menuentry['perms'] && $type_user) {
+		return 0;
 	}
-	if (!$menuentry['perms'] && $type_user) return 0; // No permissions and user is external
-	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0; // No permissions and option to hide when not allowed, even for internal user, is on
-	if (!$menuentry['perms']) return 2; // No permissions and user is external
+	// No permissions and user is external
+	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+		return 0;
+	}
+	// No permissions and option to hide when not allowed, even for internal user, is on
+	if (!$menuentry['perms']) {
+		return 2;
+	}
+	// No permissions and user is external
 	return 1;
 }
 
@@ -8230,9 +9314,13 @@ 
         // For small screen, we always use the short label instead of long label.
         if (!empty($conf->dol_optimize_smallscreen))
         {
-        	if ($displayMode == 0) $displayMode = 1;
-        	elseif ($displayMode == 4) $displayMode = 2;
-        	elseif ($displayMode == 6) $displayMode = 5;
+        	if ($displayMode == 0) {
+        		$displayMode = 1;
+        	} elseif ($displayMode == 4) {
+        		$displayMode = 2;
+        	} elseif ($displayMode == 6) {
+        		$displayMode = 5;
+        	}
         }
 
         // For backward compatibility. Image's filename are still in French, so we use this array to convert
@@ -8381,9 +9469,13 @@ 
     }
 
     $class = 'btnTitle';
-    if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';
+    if ($iconClass == 'fa fa-plus-circle') {
+    	$class .= ' btnTitlePlus';
+    }
 
-    if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
+    if (!empty($params['morecss'])) {
+    	$class .= ' '.$params['morecss'];
+    }
 
     $attr = array(
         'class' => $class
@@ -8565,9 +9657,15 @@ 
 		$subelement = 'product';
 	}
 
-	if (empty($classfile)) $classfile = strtolower($subelement);
-	if (empty($classname)) $classname = ucfirst($subelement);
-	if (empty($classpath)) $classpath = $module.'/class';
+	if (empty($classfile)) {
+		$classfile = strtolower($subelement);
+	}
+	if (empty($classname)) {
+		$classname = ucfirst($subelement);
+	}
+	if (empty($classpath)) {
+		$classpath = $module.'/class';
+	}
 
 	$element_properties = array(
 		'module' => $module,

Indentation +426 added lines, -426 removed lines

@@ -356,7 +356,7 @@ 
 			}
 			if (!empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 			{
-			    if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
+				if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 				{
 					// Now search in setup to overwrite default values
 					if (!empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
@@ -628,22 +628,22 @@ 
 
 if (!function_exists('dol_getprefix'))
 {
-    /**
-     *  Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.
-     *  The prefix is unique for instance and avoid conflict between multi-instances, even when having two instances with same root dir
-     *  or two instances in same virtual servers.
-     *
-     *  @param  string  $mode                   '' (prefix for session name) or 'email' (prefix for email id)
-     *  @return	string                          A calculated prefix
-     */
-    function dol_getprefix($mode = '')
-    {
-        global $conf;
+	/**
+	 *  Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.
+	 *  The prefix is unique for instance and avoid conflict between multi-instances, even when having two instances with same root dir
+	 *  or two instances in same virtual servers.
+	 *
+	 *  @param  string  $mode                   '' (prefix for session name) or 'email' (prefix for email id)
+	 *  @return	string                          A calculated prefix
+	 */
+	function dol_getprefix($mode = '')
+	{
+		global $conf;
 
 		// If prefix is for email
 		if ($mode == 'email')
 		{
-		    if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
+			if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
 			{
 				if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
 				elseif (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
@@ -906,7 +906,7 @@ 
 		return rawurldecode($string);
 	} else {
 		// See http://www.ascii-code.com/
-        $string = strtr(
+		$string = strtr(
 			$str,
 			"\xC0\xC1\xC2\xC3\xC4\xC5\xC7
 			\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1
@@ -1056,7 +1056,7 @@ 
  */
 function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = '', $restricttologhandler = '', $logcontext = null)
 {
-    global $conf, $user, $debugbar;
+	global $conf, $user, $debugbar;
 
 	// If syslog module enabled
 	if (empty($conf->syslog->enabled)) return;
@@ -1090,9 +1090,9 @@ 
 
 		// If adding log inside HTML page is required
 		if ((!empty($_REQUEST['logtohtml']) && !empty($conf->global->MAIN_ENABLE_LOG_TO_HTML))
-		    || (!empty($user->rights->debugbar->read) && is_object($debugbar)))
+			|| (!empty($user->rights->debugbar->read) && is_object($debugbar)))
 		{
-		    $conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$logLevels[$level]." ".$message;
+			$conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$logLevels[$level]." ".$message;
 		}
 
 		//TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output
@@ -1522,7 +1522,7 @@ 
 
 			if (!$phototoshow)      // Show No photo link (picto of object)
 			{
-			    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
+				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
 				if ($object->element == 'action')
 				{
 					$width = 80;
@@ -1871,23 +1871,23 @@ 
 	$reg = array();
 	if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg))	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
 	{
-	    dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
-	    return '';
+		dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
+		return '';
 	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg))    // Still available to solve problems in extrafields of type date
 	{
-	    // This part of code should not be used.
-	    dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);
-	    //if (function_exists('debug_print_backtrace')) debug_print_backtrace();
-	    // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
-	    $syear	= (!empty($reg[1]) ? $reg[1] : '');
-	    $smonth = (!empty($reg[2]) ? $reg[2] : '');
-	    $sday	= (!empty($reg[3]) ? $reg[3] : '');
-	    $shour	= (!empty($reg[4]) ? $reg[4] : '');
-	    $smin	= (!empty($reg[5]) ? $reg[5] : '');
-	    $ssec	= (!empty($reg[6]) ? $reg[6] : '');
-
-	    $time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
-	    $ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
+		// This part of code should not be used.
+		dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);
+		//if (function_exists('debug_print_backtrace')) debug_print_backtrace();
+		// Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
+		$syear	= (!empty($reg[1]) ? $reg[1] : '');
+		$smonth = (!empty($reg[2]) ? $reg[2] : '');
+		$sday	= (!empty($reg[3]) ? $reg[3] : '');
+		$shour	= (!empty($reg[4]) ? $reg[4] : '');
+		$smin	= (!empty($reg[5]) ? $reg[5] : '');
+		$ssec	= (!empty($reg[6]) ? $reg[6] : '');
+
+		$time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
+		$ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
 	} else {
 		// Date is a timestamps
 		if ($time < 100000000000)	// Protection against bad date values
@@ -2232,23 +2232,23 @@ 
  */
 function getArrayOfSocialNetworks()
 {
-    global $conf, $db;
-    $sql = "SELECT rowid, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";
-    $sql .= " WHERE entity=".$conf->entity;
-    $socialnetworks = array();
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql)) {
-            $socialnetworks[$obj->code] = array(
-                'rowid' => $obj->rowid,
-                'label' => $obj->label,
-                'url' => $obj->url,
-                'icon' => $obj->icon,
-                'active' => $obj->active,
-            );
-        }
-    }
-    return $socialnetworks;
+	global $conf, $db;
+	$sql = "SELECT rowid, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";
+	$sql .= " WHERE entity=".$conf->entity;
+	$socialnetworks = array();
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$socialnetworks[$obj->code] = array(
+				'rowid' => $obj->rowid,
+				'label' => $obj->label,
+				'url' => $obj->url,
+				'icon' => $obj->icon,
+				'active' => $obj->active,
+			);
+		}
+	}
+	return $socialnetworks;
 }
 
 /**
@@ -2435,7 +2435,7 @@ 
 		}
 	} elseif (strtoupper($countrycode) == "MU")
 	{
-        //Maurice
+		//Maurice
 		if (dol_strlen($phone) == 11)
 		{//ex: +230_ABC_DE_FG
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
@@ -2565,10 +2565,10 @@ 
 		}
 	} elseif (strtoupper($countrycode) == "AU")
 	{
-        //Australie
+		//Australie
 		if (dol_strlen($phone) == 12)
 		{
-            //ex: +61_A_BCDE_FGHI
+			//ex: +61_A_BCDE_FGHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);
 		}
 	}
@@ -3003,39 +3003,39 @@ 
 		$fullpathpicto = $picto;
 		$reg = array();
 		if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {
-		    $morecss .= ($morecss ? ' ' : '').$reg[1];
-		    $moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
+			$morecss .= ($morecss ? ' ' : '').$reg[1];
+			$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
 		}
 	} else {
 		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
-        if (empty($srconly) && in_array($pictowithouttext, array(
-        		'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
-        		'accountancy', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
-        		'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cubes',
-        		'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'external-link-alt', 'external-link-square-alt',
-        		'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'help',
-        		'intervention', 'label', 'language', 'list', 'listlight', 'lot',
-        		'map-marker-alt', 'money-bill-alt', 'mrp', 'note',
-        		'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
-	        	'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
-        		'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
-        		'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
-        		'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
-        		'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
-        		'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
-        		'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
-        		'object_recruitmentjobposition',
-        		'object_shipment', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
-        		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
-        		'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
-        		'off', 'on', 'order',
-        		'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
+		if (empty($srconly) && in_array($pictowithouttext, array(
+				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
+				'accountancy', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
+				'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cubes',
+				'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'external-link-alt', 'external-link-square-alt',
+				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'help',
+				'intervention', 'label', 'language', 'list', 'listlight', 'lot',
+				'map-marker-alt', 'money-bill-alt', 'mrp', 'note',
+				'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
+				'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
+				'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
+				'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
+				'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
+				'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
+				'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
+				'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
+				'object_recruitmentjobposition',
+				'object_shipment', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
+				'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
+				'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
+				'off', 'on', 'order',
+				'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
 				'setup', 'sign-out', 'split', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
-        		'home', 'hrm', 'companies', 'products', 'commercial', 'invoicing', 'pencil-ruler', 'preview', 'project', 'projectpub', 'supplier_invoice', 'members', 'ticket', 'generic',
-        		'error', 'warning', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
-        		'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
+				'home', 'hrm', 'companies', 'products', 'commercial', 'invoicing', 'pencil-ruler', 'preview', 'project', 'projectpub', 'supplier_invoice', 'members', 'ticket', 'generic',
+				'error', 'warning', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
+				'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
 			)
 		)) {
 			$fakey = $pictowithouttext;
@@ -3050,40 +3050,40 @@ 
 
 			$pictowithouttext = str_replace('object_', '', $pictowithouttext);
 
-		    $arrayconvpictotofa = array(
-		    	'account'=>'university', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'address'=> 'address-book',
-		    	'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes',
-		    	'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'conversation'=>'comments', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
-		    	'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
-		    	'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',
-		    	'hrm'=>'user-tie', 'margin'=>'calculator', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
-		    	'email'=>'at',
-		    	'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
-		    	'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group',
-		    	'member'=>'users', 'mrp'=>'cubes', 'trip'=>'wallet', 'group'=>'users',
-		    	'sign-out'=>'sign-out-alt',
-		    	'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
-		    	'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
-		    	'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
-		    	'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
-		    	'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
-		    	'other'=>'square',
-		    	'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
+			$arrayconvpictotofa = array(
+				'account'=>'university', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'address'=> 'address-book',
+				'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes',
+				'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'conversation'=>'comments', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
+				'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
+				'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',
+				'hrm'=>'user-tie', 'margin'=>'calculator', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
+				'email'=>'at',
+				'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
+				'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group',
+				'member'=>'users', 'mrp'=>'cubes', 'trip'=>'wallet', 'group'=>'users',
+				'sign-out'=>'sign-out-alt',
+				'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
+				'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
+				'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
+				'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
+				'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
+				'other'=>'square',
+				'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
 				'recruitmentjobposition'=>'door-open', 'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
-		    	'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
-		    	'resource'=>'laptop-house',
-		    	'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
-		    	'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
-		    	'title_agenda'=>'calendar-alt',
-		    	'uparrow'=>'mail-forward', 'vcard'=>'address-card',
-		    	'jabber'=>'comment-o',
-		    	'website'=>'globe-americas'
-		    );
+				'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
+				'resource'=>'laptop-house',
+				'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
+				'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
+				'title_agenda'=>'calendar-alt',
+				'uparrow'=>'mail-forward', 'vcard'=>'address-card',
+				'jabber'=>'comment-o',
+				'website'=>'globe-americas'
+			);
 			if ($pictowithouttext == 'off') {
-			    $fakey = 'fa-square';
+				$fakey = 'fa-square';
 				$fasize = '1.3em';
 			} elseif ($pictowithouttext == 'on') {
-			    $fakey = 'fa-check-square';
+				$fakey = 'fa-check-square';
 				$fasize = '1.3em';
 			} elseif ($pictowithouttext == 'listlight') {
 				$fakey = 'fa-download';
@@ -3092,12 +3092,12 @@ 
 				$fakey = 'fa-print';
 				$fasize = '1.2em';
 			} elseif ($pictowithouttext == 'note') {
-			    $fakey = 'fa-sticky-note';
+				$fakey = 'fa-sticky-note';
 				$marginleftonlyshort = 1;
 			} elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {
-			    $convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');
-			    $fakey = 'fa-'.$convertarray[$pictowithouttext];
-			    if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
+				$convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');
+				$fakey = 'fa-'.$convertarray[$pictowithouttext];
+				if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
 				$marginleftonlyshort = 1;
 			} elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
 			{
@@ -3159,20 +3159,20 @@ 
 			}
 
 			// This snippet only needed since function img_edit accepts only one additional parameter: no separate one for css only.
-            // class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
-            $reg = array();
+			// class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
+			$reg = array();
 			if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {
-                $morecss .= ($morecss ? ' ' : '').$reg[1];
-                $moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
-            }
-            if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {
-                $morestyle = ' '.$reg[1];
-                $moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);
-            }
-            $moreatt = trim($moreatt);
-
-            $enabledisablehtml = '<span class="'.$fa.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');
-            $enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';
+				$morecss .= ($morecss ? ' ' : '').$reg[1];
+				$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
+			}
+			if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {
+				$morestyle = ' '.$reg[1];
+				$moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);
+			}
+			$moreatt = trim($moreatt);
+
+			$enabledisablehtml = '<span class="'.$fa.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');
+			$enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$enabledisablehtml .= $titlealt;
 			}
@@ -3221,7 +3221,7 @@ 
 		return $fullpathpicto;
 	}
 		// tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for blind people
-    return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt.($morecss ? ' class="'.$morecss.'"' : '') : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup
+	return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt.($morecss ? ' class="'.$morecss.'"' : '') : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup
 }
 
 /**
@@ -3824,7 +3824,7 @@ 
 		$langs->load("main");
 	}
 	// Load translation files required by the page
-    $langs->loadLangs(array('main', 'errors'));
+	$langs->loadLangs(array('main', 'errors'));
 
 	if ($_SERVER['DOCUMENT_ROOT'])    // Mode web
 	{
@@ -3860,7 +3860,7 @@ 
 
 	if (!empty($conf->modules))
 	{
-	    $out .= "<b>".$langs->trans("Modules").":</b> ".join(', ', $conf->modules)."<br>\n";
+		$out .= "<b>".$langs->trans("Modules").":</b> ".join(', ', $conf->modules)."<br>\n";
 	}
 
 	if (is_object($db))
@@ -4534,7 +4534,7 @@ 
 		$listoflanguagesbefore = array('nl_NL');
 		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore))
 		{
-		    $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
+			$cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
 		} else {
 			$tmpcur = $outlangs->getCurrencySymbol($currency_code);
 			$cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
@@ -5360,7 +5360,7 @@ 
 		// We will enhance here a common way of forging path for document storage
 		// Here, object->id, object->ref and modulepart are required.
 		//var_dump($modulepart);
-        if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice',
+		if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice',
 			'supplier_order', 'supplier_proposal', 'shipment', 'contract', 'expensereport', 'ficheinter')))
 		{
 			$path = ($object->ref ? $object->ref : $object->id);
@@ -5864,18 +5864,18 @@ 
  */
 function dol_concatdesc($text1, $text2, $forxml = false, $invert = false)
 {
-    if (!empty($invert))
-    {
-            $tmp = $text1;
-            $text1 = $text2;
-            $text2 = $tmp;
-    }
+	if (!empty($invert))
+	{
+			$tmp = $text1;
+			$text1 = $text2;
+			$text2 = $tmp;
+	}
 
-    $ret = '';
-    $ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1;
-    $ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "<br \>\n" : "<br>\n") : "\n") : "";
-    $ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2;
-    return $ret;
+	$ret = '';
+	$ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1;
+	$ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "<br \>\n" : "<br>\n") : "\n") : "";
+	$ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2;
+	return $ret;
 }
 
 
@@ -5901,7 +5901,7 @@ 
 		// Add SIGNATURE into substitutionarray first, so, when we will make the substitution,
 		// this will include signature content first and then replace var found into content of signature
 		$signature = $user->signature;
-        $substitutionarray = array_merge($substitutionarray, array(
+		$substitutionarray = array_merge($substitutionarray, array(
 		'__USER_SIGNATURE__' => (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '')
 		)
 			);
@@ -5911,11 +5911,11 @@ 
 			$substitutionarray['__SIGNATURE__'] = (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '');
 		}
 
-        $substitutionarray = array_merge($substitutionarray, array(
+		$substitutionarray = array_merge($substitutionarray, array(
 		'__USER_ID__' => (string) $user->id,
 		'__USER_LOGIN__' => (string) $user->login,
-        '__USER_EMAIL__' => (string) $user->email,
-        '__USER_LASTNAME__' => (string) $user->lastname,
+		'__USER_EMAIL__' => (string) $user->email,
+		'__USER_LASTNAME__' => (string) $user->lastname,
 		'__USER_FIRSTNAME__' => (string) $user->firstname,
 		'__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),
 		'__USER_SUPERVISOR_ID__' => (string) ($user->fk_user ? $user->fk_user : '0'),
@@ -5925,7 +5925,7 @@ 
 	}
 	if ((empty($exclude) || !in_array('mycompany', $exclude)) && is_object($mysoc))
 	{
-        $substitutionarray = array_merge($substitutionarray, array(
+		$substitutionarray = array_merge($substitutionarray, array(
 			'__MYCOMPANY_NAME__'    => $mysoc->name,
 			'__MYCOMPANY_EMAIL__'   => $mysoc->email,
 			'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
@@ -5941,8 +5941,8 @@ 
 			'__MYCOMPANY_TOWN__'    => $mysoc->town,
 			'__MYCOMPANY_COUNTRY__'    => $mysoc->country,
 			'__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id,
-        	'__MYCOMPANY_COUNTRY_CODE__' => $mysoc->country_code,
-        	'__MYCOMPANY_CURRENCY_CODE__' => $conf->currency
+			'__MYCOMPANY_COUNTRY_CODE__' => $mysoc->country_code,
+			'__MYCOMPANY_CURRENCY_CODE__' => $conf->currency
 		));
 	}
 
@@ -6019,7 +6019,7 @@ 
 
 			if (!empty($conf->expedition->enabled))
 			{
-			    $substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number';
+				$substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number';
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url';
 			}
 		} else {
@@ -6169,17 +6169,17 @@ 
 					{
 						foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
 							$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];
-                            if ($extrafields->attribute_type[$key] == 'date') {
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = dol_print_date($object->array_options['options_' . $key], 'day');
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = dol_print_date($object->array_options['options_' . $key], 'day', 'tzserver', $outputlangs);
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = dol_print_date($object->array_options['options_' . $key], 'dayrfc');
-                            } elseif ($extrafields->attribute_type[$key] == 'datetime') {
-                                $datetime = $object->array_options['options_'.$key];
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour') : '');
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : '');
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_DAY_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'day', 'tzserver', $outputlangs) : '');
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhourrfc') : '');
-                            }
+							if ($extrafields->attribute_type[$key] == 'date') {
+								$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = dol_print_date($object->array_options['options_' . $key], 'day');
+								$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = dol_print_date($object->array_options['options_' . $key], 'day', 'tzserver', $outputlangs);
+								$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = dol_print_date($object->array_options['options_' . $key], 'dayrfc');
+							} elseif ($extrafields->attribute_type[$key] == 'datetime') {
+								$datetime = $object->array_options['options_'.$key];
+								$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour') : '');
+								$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : '');
+								$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_DAY_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'day', 'tzserver', $outputlangs) : '');
+								$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhourrfc') : '');
+							}
 						}
 					}
 				}
@@ -6265,7 +6265,7 @@ 
 		$tmp4 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
 		$tmp5 = dol_get_next_month($tmp['mon'], $tmp['year']);
 
-        $substitutionarray = array_merge($substitutionarray, array(
+		$substitutionarray = array_merge($substitutionarray, array(
 			'__DAY__' => (string) $tmp['mday'],
 			'__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday
 			'__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon
@@ -6495,11 +6495,11 @@ 
 		$ret .= $lastname;
 	} elseif ($nameorder == 2 || $nameorder == 3)
 	{
-	    $ret .= $firstname;
-	    if (empty($ret) && $nameorder == 3)
-	    {
-	    	$ret .= $lastname;
-	    }
+		$ret .= $firstname;
+		if (empty($ret) && $nameorder == 3)
+		{
+			$ret .= $lastname;
+		}
 	} else {
 		$ret .= $lastname;
 		if ($firstname && $lastname) $ret .= ' ';
@@ -6801,12 +6801,12 @@ 
 				}
 			}
 
-            if (!$natsort) {
-                ($order == 'asc') ? asort($temp) : arsort($temp);
-            } else {
-                ($case_sensitive) ? natsort($temp) : natcasesort($temp);
-                if ($order != 'asc') $temp = array_reverse($temp, true);
-            }
+			if (!$natsort) {
+				($order == 'asc') ? asort($temp) : arsort($temp);
+			} else {
+				($case_sensitive) ? natsort($temp) : natcasesort($temp);
+				if ($order != 'asc') $temp = array_reverse($temp, true);
+			}
 
 			$sorted = array();
 
@@ -7236,18 +7236,18 @@ 
 
 	if (function_exists('locale_get_primary_language') && function_exists('locale_get_region'))    // Need extension php-intl
 	{
-	    foreach ($locales as $locale)
-    	{
-    		$locale_language = locale_get_primary_language($locale);
-    		$locale_region = locale_get_region($locale);
-    		if (strtoupper($countrycode) == $locale_region)
-    		{
-    			//var_dump($locale.'-'.$locale_language.'-'.$locale_region);
-    			return strtolower($locale_language).'_'.strtoupper($locale_region);
-    		}
-    	}
+		foreach ($locales as $locale)
+		{
+			$locale_language = locale_get_primary_language($locale);
+			$locale_region = locale_get_region($locale);
+			if (strtoupper($countrycode) == $locale_region)
+			{
+				//var_dump($locale.'-'.$locale_language.'-'.$locale_region);
+				return strtolower($locale_language).'_'.strtoupper($locale_region);
+			}
+		}
 	} else {
-        dol_syslog("Warning Exention php-intl is not available", LOG_WARNING);
+		dol_syslog("Warning Exention php-intl is not available", LOG_WARNING);
 	}
 
 	return null;
@@ -7357,7 +7357,7 @@ 
 		if ($reshook > 0)
 		{
 			$head = $hookmanager->resArray;
-            $h = count($head);
+			$h = count($head);
 		}
 	}
 }
@@ -7540,15 +7540,15 @@ 
 		// Add Xdebug coverage of code
 		if (defined('XDEBUGCOVERAGE'))
 		{
-		    print_r(xdebug_get_code_coverage());
+			print_r(xdebug_get_code_coverage());
 		}
 
 		// Add DebugBar data
-	    if (!empty($user->rights->debugbar->read) && is_object($debugbar))
-	    {
-	        $debugbar['time']->stopMeasure('pageaftermaster');
-	        print '<!-- Output debugbar data -->'."\n";
-		    print $debugbar->getRenderer()->render();
+		if (!empty($user->rights->debugbar->read) && is_object($debugbar))
+		{
+			$debugbar['time']->stopMeasure('pageaftermaster');
+			print '<!-- Output debugbar data -->'."\n";
+			print $debugbar->getRenderer()->render();
 		} elseif (count($conf->logbuffer))    // If there is some logs in buffer to show
 		{
 			print "\n";
@@ -7716,30 +7716,30 @@ 
 				if ($mode == -3) $newres .= ' OR '.$field.' IS NULL';
 			} elseif ($mode == 4)
 			{
-			    $tmparray = explode(',', trim($crit));
-			    if (count($tmparray))
-			    {
-			        $listofcodes = '';
-			        foreach ($tmparray as $val)
-			        {
-			            if ($val)
-			            {
-			                $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\'';
-			                $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\'';
-			                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\'';
-			                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\'';
-			                $newres .= ')';
-			                $i2++;
-			            }
-			        }
-			    }
+				$tmparray = explode(',', trim($crit));
+				if (count($tmparray))
+				{
+					$listofcodes = '';
+					foreach ($tmparray as $val)
+					{
+						if ($val)
+						{
+							$newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\'';
+							$newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\'';
+							$newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\'';
+							$newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\'';
+							$newres .= ')';
+							$i2++;
+						}
+					}
+				}
 			} else // $mode=0
 			{
 				$tmpcrits = explode('|', $crit);
 				$i3 = 0;
 				foreach ($tmpcrits as $tmpcrit)
 				{
-                    if ($tmpcrit !== '0' && empty($tmpcrit)) continue;
+					if ($tmpcrit !== '0' && empty($tmpcrit)) continue;
 
 					$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
 
@@ -7917,19 +7917,19 @@ 
 	if (preg_match('/\.tsv$/i', $tmpfile)) { $mime = 'text/tab-separated-values'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
 	if (preg_match('/\.(cf|conf|log)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
 	if (preg_match('/\.ini$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'ini'; $famime = 'file-text-o'; }
-    if (preg_match('/\.md$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'md'; $famime = 'file-text-o'; }
+	if (preg_match('/\.md$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'md'; $famime = 'file-text-o'; }
 	if (preg_match('/\.css$/i', $tmpfile)) { $mime = 'text/css'; $imgmime = 'css.png'; $srclang = 'css'; $famime = 'file-text-o'; }
 	// Certificate files
 	if (preg_match('/\.(crt|cer|key|pub)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
 	// XML based (HTML/XML/XAML)
 	if (preg_match('/\.(html|htm|shtml)$/i', $tmpfile)) { $mime = 'text/html'; $imgmime = 'html.png'; $srclang = 'html'; $famime = 'file-text-o'; }
 	if (preg_match('/\.(xml|xhtml)$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xml'; $famime = 'file-text-o'; }
-    if (preg_match('/\.xaml$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-text-o'; }
+	if (preg_match('/\.xaml$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-text-o'; }
 	// Languages
 	if (preg_match('/\.bas$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'bas'; $famime = 'file-code-o'; }
 	if (preg_match('/\.(c)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'c'; $famime = 'file-code-o'; }
 	if (preg_match('/\.(cpp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cpp'; $famime = 'file-code-o'; }
-    if (preg_match('/\.cs$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cs'; $famime = 'file-code-o'; }
+	if (preg_match('/\.cs$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cs'; $famime = 'file-code-o'; }
 	if (preg_match('/\.(h)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'h'; $famime = 'file-code-o'; }
 	if (preg_match('/\.(java|jsp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'java'; $famime = 'file-code-o'; }
 	if (preg_match('/\.php([0-9]{1})?$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o'; }
@@ -8059,7 +8059,7 @@ 
  */
 function colorIsLight($stringcolor)
 {
-    $stringcolor = str_replace('#', '', $stringcolor);
+	$stringcolor = str_replace('#', '', $stringcolor);
 	$res = -1;
 	if (!empty($stringcolor))
 	{
@@ -8142,28 +8142,28 @@ 
  */
 function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params = array())
 {
-    $attr = array(
-    	'class'=>'badge '.(!empty($mode) ? ' badge-'.$mode : '').(!empty($type) ? ' badge-'.$type : '').(empty($params['css']) ? '' : ' '.$params['css'])
-    );
+	$attr = array(
+		'class'=>'badge '.(!empty($mode) ? ' badge-'.$mode : '').(!empty($type) ? ' badge-'.$type : '').(empty($params['css']) ? '' : ' '.$params['css'])
+	);
 
-    if (empty($html)) {
-        $html = $label;
-    }
+	if (empty($html)) {
+		$html = $label;
+	}
 
-    if (!empty($url)) {
-        $attr['href'] = $url;
-    }
+	if (!empty($url)) {
+		$attr['href'] = $url;
+	}
 
-    if ($mode === 'dot') {
-        $attr['class'] .= ' classfortooltip';
-        $attr['title'] = $html;
-        $attr['aria-label'] = $label;
-        $html = '';
-    }
+	if ($mode === 'dot') {
+		$attr['class'] .= ' classfortooltip';
+		$attr['title'] = $html;
+		$attr['aria-label'] = $label;
+		$html = '';
+	}
 
-    // Override attr
-    if (!empty($params['attr']) && is_array($params['attr'])) {
-        foreach ($params['attr']as $key => $value) {
+	// Override attr
+	if (!empty($params['attr']) && is_array($params['attr'])) {
+		foreach ($params['attr']as $key => $value) {
 			if ($key == 'class') {
 				$attr['class'] .= ' '.$value;
 			} elseif ($key == 'classOverride') {
@@ -8171,24 +8171,24 @@ 
 			} else {
 				$attr[$key] = $value;
 			}
-        }
-    }
+		}
+	}
 
-    // TODO: add hook
+	// TODO: add hook
 
-    // escape all attribute
-    $attr = array_map('dol_escape_htmltag', $attr);
+	// escape all attribute
+	$attr = array_map('dol_escape_htmltag', $attr);
 
-    $TCompiledAttr = array();
-    foreach ($attr as $key => $value) {
-        $TCompiledAttr[] = $key.'="'.$value.'"';
-    }
+	$TCompiledAttr = array();
+	foreach ($attr as $key => $value) {
+		$TCompiledAttr[] = $key.'="'.$value.'"';
+	}
 
-    $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';
+	$compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';
 
-    $tag = !empty($url) ? 'a' : 'span';
+	$tag = !empty($url) ? 'a' : 'span';
 
-    return '<'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'>';
+	return '<'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'>';
 }
 
 
@@ -8206,83 +8206,83 @@ 
  */
 function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array())
 {
-    global $conf;
-
-    $return = '';
-    $dolGetBadgeParams = array();
-
-    if (!empty($params['badgeParams'])) {
-        $dolGetBadgeParams = $params['badgeParams'];
-    }
-
-    // TODO : add a hook
-
-    if ($displayMode == 0) {
-        $return = !empty($html) ? $html : $statusLabel;
-    } elseif ($displayMode == 1) {
-        $return = !empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel);
-    } // Use status with images (for backward compatibility)
-    elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) {
-        $return = '';
-        $htmlLabel      = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
-        $htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
-
-        // For small screen, we always use the short label instead of long label.
-        if (!empty($conf->dol_optimize_smallscreen))
-        {
-        	if ($displayMode == 0) $displayMode = 1;
-        	elseif ($displayMode == 4) $displayMode = 2;
-        	elseif ($displayMode == 6) $displayMode = 5;
-        }
-
-        // For backward compatibility. Image's filename are still in French, so we use this array to convert
-        $statusImg = array(
-        	'status0' => 'statut0',
-        	'status1' => 'statut1',
-        	'status2' => 'statut2',
-        	'status3' => 'statut3',
-        	'status4' => 'statut4',
-        	'status5' => 'statut5',
-        	'status6' => 'statut6',
-        	'status7' => 'statut7',
-        	'status8' => 'statut8',
-        	'status9' => 'statut9'
-        );
-
-        if (!empty($statusImg[$statusType])) {
-            $htmlImg = img_picto($statusLabel, $statusImg[$statusType]);
-        } else {
-            $htmlImg = img_picto($statusLabel, $statusType);
-        }
-
-        if ($displayMode === 2) {
-            $return = $htmlImg.' '.$htmlLabelShort;
-        } elseif ($displayMode === 3) {
-            $return = $htmlImg;
-        } elseif ($displayMode === 4) {
-            $return = $htmlImg.' '.$htmlLabel;
-        } elseif ($displayMode === 5) {
-            $return = $htmlLabelShort.' '.$htmlImg;
-        } else { // $displayMode >= 6
-            $return = $htmlLabel.' '.$htmlImg;
-        }
-    } // Use new badge
-    elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) {
-        $statusLabelShort = !empty($statusLabelShort) ? $statusLabelShort : $statusLabel;
+	global $conf;
+
+	$return = '';
+	$dolGetBadgeParams = array();
+
+	if (!empty($params['badgeParams'])) {
+		$dolGetBadgeParams = $params['badgeParams'];
+	}
+
+	// TODO : add a hook
+
+	if ($displayMode == 0) {
+		$return = !empty($html) ? $html : $statusLabel;
+	} elseif ($displayMode == 1) {
+		$return = !empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel);
+	} // Use status with images (for backward compatibility)
+	elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) {
+		$return = '';
+		$htmlLabel      = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
+		$htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
+
+		// For small screen, we always use the short label instead of long label.
+		if (!empty($conf->dol_optimize_smallscreen))
+		{
+			if ($displayMode == 0) $displayMode = 1;
+			elseif ($displayMode == 4) $displayMode = 2;
+			elseif ($displayMode == 6) $displayMode = 5;
+		}
+
+		// For backward compatibility. Image's filename are still in French, so we use this array to convert
+		$statusImg = array(
+			'status0' => 'statut0',
+			'status1' => 'statut1',
+			'status2' => 'statut2',
+			'status3' => 'statut3',
+			'status4' => 'statut4',
+			'status5' => 'statut5',
+			'status6' => 'statut6',
+			'status7' => 'statut7',
+			'status8' => 'statut8',
+			'status9' => 'statut9'
+		);
+
+		if (!empty($statusImg[$statusType])) {
+			$htmlImg = img_picto($statusLabel, $statusImg[$statusType]);
+		} else {
+			$htmlImg = img_picto($statusLabel, $statusType);
+		}
+
+		if ($displayMode === 2) {
+			$return = $htmlImg.' '.$htmlLabelShort;
+		} elseif ($displayMode === 3) {
+			$return = $htmlImg;
+		} elseif ($displayMode === 4) {
+			$return = $htmlImg.' '.$htmlLabel;
+		} elseif ($displayMode === 5) {
+			$return = $htmlLabelShort.' '.$htmlImg;
+		} else { // $displayMode >= 6
+			$return = $htmlLabel.' '.$htmlImg;
+		}
+	} // Use new badge
+	elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) {
+		$statusLabelShort = !empty($statusLabelShort) ? $statusLabelShort : $statusLabel;
 
 		$dolGetBadgeParams['attr']['class'] = 'badge-status';
 		$dolGetBadgeParams['attr']['title'] = $statusLabel;
 
-        if ($displayMode == 3) {
-            $return = dolGetBadge($statusLabel, '', $statusType, 'dot', $url, $dolGetBadgeParams);
-        } elseif ($displayMode === 5) {
-            $return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams);
-        } else {
-            $return = dolGetBadge($statusLabel, $html, $statusType, '', $url, $dolGetBadgeParams);
-        }
-    }
+		if ($displayMode == 3) {
+			$return = dolGetBadge($statusLabel, '', $statusType, 'dot', $url, $dolGetBadgeParams);
+		} elseif ($displayMode === 5) {
+			$return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams);
+		} else {
+			$return = dolGetBadge($statusLabel, $html, $statusType, '', $url, $dolGetBadgeParams);
+		}
+	}
 
-    return $return;
+	return $return;
 }
 
 
@@ -8300,63 +8300,63 @@ 
  */
 function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())
 {
-    $class = 'butAction';
-    if ($actionType == 'danger' || $actionType == 'delete') {
-        $class = 'butActionDelete';
-    }
+	$class = 'butAction';
+	if ($actionType == 'danger' || $actionType == 'delete') {
+		$class = 'butActionDelete';
+	}
 
-    $attr = array(
-        'class' => $class
-        ,'href' => empty($url) ? '' : $url
-    );
+	$attr = array(
+		'class' => $class
+		,'href' => empty($url) ? '' : $url
+	);
 
-    if (empty($html)) {
-        $html = $label;
-    } else {
-        $attr['aria-label'] = $label;
-    }
+	if (empty($html)) {
+		$html = $label;
+	} else {
+		$attr['aria-label'] = $label;
+	}
 
-    if (empty($userRight)) {
-        $attr['class'] = 'butActionRefused';
-        $attr['href'] = '';
-    }
+	if (empty($userRight)) {
+		$attr['class'] = 'butActionRefused';
+		$attr['href'] = '';
+	}
 
-    if (!empty($id)) {
-        $attr['id'] = $id;
-    }
+	if (!empty($id)) {
+		$attr['id'] = $id;
+	}
 
-    // Override attr
-    if (!empty($params['attr']) && is_array($params['attr'])) {
-        foreach ($params['attr'] as $key => $value) {
-            if ($key == 'class') {
-                $attr['class'] .= ' '.$value;
-            } elseif ($key == 'classOverride') {
-                $attr['class'] = $value;
-            } else {
-                $attr[$key] = $value;
-            }
-        }
-    }
+	// Override attr
+	if (!empty($params['attr']) && is_array($params['attr'])) {
+		foreach ($params['attr'] as $key => $value) {
+			if ($key == 'class') {
+				$attr['class'] .= ' '.$value;
+			} elseif ($key == 'classOverride') {
+				$attr['class'] = $value;
+			} else {
+				$attr[$key] = $value;
+			}
+		}
+	}
 
-    if (isset($attr['href']) && empty($attr['href'])) {
-        unset($attr['href']);
-    }
+	if (isset($attr['href']) && empty($attr['href'])) {
+		unset($attr['href']);
+	}
 
-    // TODO : add a hook
+	// TODO : add a hook
 
-    // escape all attribute
-    $attr = array_map('dol_escape_htmltag', $attr);
+	// escape all attribute
+	$attr = array_map('dol_escape_htmltag', $attr);
 
-    $TCompiledAttr = array();
-    foreach ($attr as $key => $value) {
-        $TCompiledAttr[] = $key.'="'.$value.'"';
-    }
+	$TCompiledAttr = array();
+	foreach ($attr as $key => $value) {
+		$TCompiledAttr[] = $key.'="'.$value.'"';
+	}
 
-    $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';
+	$compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';
 
-    $tag = !empty($attr['href']) ? 'a' : 'span';
+	$tag = !empty($attr['href']) ? 'a' : 'span';
 
-    return '<div class="inline-block divButAction"><'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'></div>';
+	return '<div class="inline-block divButAction"><'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'></div>';
 }
 
 /**
@@ -8373,85 +8373,85 @@ 
  */
 function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $url = '', $id = '', $status = 1, $params = array())
 {
-    global $langs, $conf, $user;
+	global $langs, $conf, $user;
 
-    // Actually this conf is used in css too for external module compatibility and smooth transition to this function
-    if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin) && $status <= 0) {
-        return '';
-    }
+	// Actually this conf is used in css too for external module compatibility and smooth transition to this function
+	if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin) && $status <= 0) {
+		return '';
+	}
 
-    $class = 'btnTitle';
-    if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';
+	$class = 'btnTitle';
+	if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';
 
-    if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
+	if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
 
-    $attr = array(
-        'class' => $class
-        ,'href' => empty($url) ? '' : $url
-    );
+	$attr = array(
+		'class' => $class
+		,'href' => empty($url) ? '' : $url
+	);
 
-    if (!empty($helpText)) {
-        $attr['title'] = dol_escape_htmltag($helpText);
-    }
+	if (!empty($helpText)) {
+		$attr['title'] = dol_escape_htmltag($helpText);
+	}
 
-    if ($status <= 0) {
-        $attr['class'] .= ' refused';
+	if ($status <= 0) {
+		$attr['class'] .= ' refused';
 
-        $attr['href'] = '';
+		$attr['href'] = '';
 
-        if ($status == -1) { // disable
-            $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));
-        } elseif ($status == 0) { // Not enough permissions
-            $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));
-        }
-    }
+		if ($status == -1) { // disable
+			$attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));
+		} elseif ($status == 0) { // Not enough permissions
+			$attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));
+		}
+	}
 
-    if (!empty($attr['title'])) {
-        $attr['class'] .= ' classfortooltip';
-    }
+	if (!empty($attr['title'])) {
+		$attr['class'] .= ' classfortooltip';
+	}
 
-    if (empty($id)) {
-        $attr['id'] = $id;
-    }
+	if (empty($id)) {
+		$attr['id'] = $id;
+	}
 
-    // Override attr
-    if (!empty($params['attr']) && is_array($params['attr'])) {
-        foreach ($params['attr'] as $key => $value) {
-            if ($key == 'class') {
-                $attr['class'] .= ' '.$value;
-            } elseif ($key == 'classOverride') {
-                $attr['class'] = $value;
-            } else {
-                $attr[$key] = $value;
-            }
-        }
-    }
+	// Override attr
+	if (!empty($params['attr']) && is_array($params['attr'])) {
+		foreach ($params['attr'] as $key => $value) {
+			if ($key == 'class') {
+				$attr['class'] .= ' '.$value;
+			} elseif ($key == 'classOverride') {
+				$attr['class'] = $value;
+			} else {
+				$attr[$key] = $value;
+			}
+		}
+	}
 
-    if (isset($attr['href']) && empty($attr['href'])) {
-        unset($attr['href']);
-    }
+	if (isset($attr['href']) && empty($attr['href'])) {
+		unset($attr['href']);
+	}
 
-    // TODO : add a hook
+	// TODO : add a hook
 
-    // escape all attribute
-    $attr = array_map('dol_escape_htmltag', $attr);
+	// escape all attribute
+	$attr = array_map('dol_escape_htmltag', $attr);
 
-    $TCompiledAttr = array();
-    foreach ($attr as $key => $value) {
-        $TCompiledAttr[] = $key.'="'.$value.'"';
-    }
+	$TCompiledAttr = array();
+	foreach ($attr as $key => $value) {
+		$TCompiledAttr[] = $key.'="'.$value.'"';
+	}
 
-    $compiledAttributes = (empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr));
+	$compiledAttributes = (empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr));
 
-    $tag = (empty($attr['href']) ? 'span' : 'a');
+	$tag = (empty($attr['href']) ? 'span' : 'a');
 
-    $button = '';
-    $button .= '<'.$tag.' '.$compiledAttributes.' >';
-    $button .= '<span class="'.$iconClass.' valignmiddle btnTitle-icon"></span>';
-    $button .= '<span class="valignmiddle text-plus-circle btnTitle-label'.(empty($params['forcenohideoftext']) ? ' hideonsmartphone' : '').'">'.$label.'</span>';
-    $button .= '</'.$tag.'>';
+	$button = '';
+	$button .= '<'.$tag.' '.$compiledAttributes.' >';
+	$button .= '<span class="'.$iconClass.' valignmiddle btnTitle-icon"></span>';
+	$button .= '<span class="valignmiddle text-plus-circle btnTitle-label'.(empty($params['forcenohideoftext']) ? ' hideonsmartphone' : '').'">'.$label.'</span>';
+	$button .= '</'.$tag.'>';
 
-    return $button;
+	return $button;
 }
 
 /**
@@ -8616,12 +8616,12 @@ 
  */
 function isAFileWithExecutableContent($filename)
 {
-    if (preg_match('/\.(htm|html|js|phar|php|php\d+|phtml|pht|pl|py|cgi|ksh|sh|shtml|bash|bat|cmd|wpk|exe|dmg)$/i', $filename))
-    {
-        return true;
-    }
+	if (preg_match('/\.(htm|html|js|phar|php|php\d+|phtml|pht|pl|py|cgi|ksh|sh|shtml|bash|bat|cmd|wpk|exe|dmg)$/i', $filename))
+	{
+		return true;
+	}
 
-    return false;
+	return false;
 }
 
 /**

htdocs/compta/paiement/class/paiement.class.php

Indentation +490 added lines, -490 removed lines

@@ -38,17 +38,17 @@ 
  */
 class Paiement extends CommonObject
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'payment';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'paiement';
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'payment';
@@ -60,7 +60,7 @@ 
 	 * @deprecated
 	 * @see $amount, $amounts
 	 */
-    public $total;
+	public $total;
 
 	/**
 	 * @deprecated
@@ -77,68 +77,68 @@ 
 	public $paiementid; // Type of payment. Id saved into fields fk_paiement on llx_paiement
 	public $paiementcode; // Code of payment.
 
-    /**
-     * @var string type libelle
-     */
-    public $type_label;
-
-    /**
-     * @var string type code
-     */
-    public $type_code;
-
-    /**
-     * @var string Numero du CHQ, VIR, etc...
-     * @deprecated
-     * @see $num_payment
-     */
-    public $numero;
-
-    /**
-     * @var string Numero du CHQ, VIR, etc...
-     * @deprecated
-     * @see $num_payment
-     */
-    public $num_paiement;
-
-    /**
-     * @var string Numero du CHQ, VIR, etc...
-     */
-    public $num_payment;
-
-    /**
-     * @var string Id of external payment mode
-     */
-    public $ext_payment_id;
-
-    /**
-     * @var string Name of external payment mode
-     */
-    public $ext_payment_site;
-
-    /**
-     * @var int bank account id of payment
-     * @deprecated
-     * @see $fk_account
-     */
-    public $bank_account;
-
-    /**
-     * @var int bank account id of payment
-     */
-    public $fk_account;
-
-    /**
-     * @var int id of payment line in bank account
-     */
-    public $bank_line;
+	/**
+	 * @var string type libelle
+	 */
+	public $type_label;
+
+	/**
+	 * @var string type code
+	 */
+	public $type_code;
+
+	/**
+	 * @var string Numero du CHQ, VIR, etc...
+	 * @deprecated
+	 * @see $num_payment
+	 */
+	public $numero;
+
+	/**
+	 * @var string Numero du CHQ, VIR, etc...
+	 * @deprecated
+	 * @see $num_payment
+	 */
+	public $num_paiement;
+
+	/**
+	 * @var string Numero du CHQ, VIR, etc...
+	 */
+	public $num_payment;
+
+	/**
+	 * @var string Id of external payment mode
+	 */
+	public $ext_payment_id;
+
+	/**
+	 * @var string Name of external payment mode
+	 */
+	public $ext_payment_site;
+
+	/**
+	 * @var int bank account id of payment
+	 * @deprecated
+	 * @see $fk_account
+	 */
+	public $bank_account;
+
+	/**
+	 * @var int bank account id of payment
+	 */
+	public $fk_account;
+
+	/**
+	 * @var int id of payment line in bank account
+	 */
+	public $bank_line;
 
 	// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
-    // fk_paiement dans llx_paiement_facture est le rowid du paiement
-    /**
-     * @var int payment id
-     */
-    public $fk_paiement; // Type of payment
+	// fk_paiement dans llx_paiement_facture est le rowid du paiement
+	/**
+	 * @var int payment id
+	 */
+	public $fk_paiement; // Type of payment
 
 
 	/**
@@ -195,8 +195,8 @@ 
 				$this->type_label = $obj->type_label;
 				$this->type_code      = $obj->type_code;
 				$this->statut         = $obj->statut;
-                $this->ext_payment_id = $obj->ext_payment_id;
-                $this->ext_payment_site = $obj->ext_payment_site;
+				$this->ext_payment_id = $obj->ext_payment_id;
+				$this->ext_payment_site = $obj->ext_payment_site;
 
 				$this->bank_account   = $obj->fk_account; // deprecated
 				$this->fk_account     = $obj->fk_account;
@@ -224,7 +224,7 @@ 
 	 *  @param  Societe   $thirdparty           Thirdparty
 	 *  @return int                 			id of created payment, < 0 if error
 	 */
-    public function create($user, $closepaidinvoices = 0, $thirdparty = null)
+	public function create($user, $closepaidinvoices = 0, $thirdparty = null)
 	{
 		global $conf, $langs;
 
@@ -233,10 +233,10 @@ 
 
 		$now = dol_now();
 
-        // Clean parameters
-        $totalamount = 0;
+		// Clean parameters
+		$totalamount = 0;
 		$totalamount_converted = 0;
-        $atleastonepaymentnotnull = 0;
+		$atleastonepaymentnotnull = 0;
 
 		if ($way == 'dolibarr')
 		{
@@ -263,16 +263,16 @@ 
 		$totalamount_converted = price2num($totalamount_converted);
 
 		// Check parameters
-        if (empty($totalamount) && empty($atleastonepaymentnotnull))	 // We accept negative amounts for withdraw reject but not empty arrays
-        {
-        	$this->errors[] = 'TotalAmountEmpty';
-        	$this->error = 'TotalAmountEmpty';
-        	return -1;
-        }
+		if (empty($totalamount) && empty($atleastonepaymentnotnull))	 // We accept negative amounts for withdraw reject but not empty arrays
+		{
+			$this->errors[] = 'TotalAmountEmpty';
+			$this->error = 'TotalAmountEmpty';
+			return -1;
+		}
 
-        dol_syslog(get_class($this)."::create insert paiement", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create insert paiement", LOG_DEBUG);
 
-        $this->db->begin();
+		$this->db->begin();
 
 		$this->ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
 
@@ -314,17 +314,17 @@ 
 						$invoice->fetch($facid);
 
 						// If we want to closed payed invoices
-					    if ($closepaidinvoices)
-					    {
-                            $paiement = $invoice->getSommePaiement();
-                            $creditnotes = $invoice->getSumCreditNotesUsed();
-                            $deposits = $invoice->getSumDepositsUsed();
-                            $alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
-                            $remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
+						if ($closepaidinvoices)
+						{
+							$paiement = $invoice->getSommePaiement();
+							$creditnotes = $invoice->getSumCreditNotesUsed();
+							$deposits = $invoice->getSumDepositsUsed();
+							$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
+							$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
 							//var_dump($invoice->total_ttc.' - '.$paiement.' -'.$creditnotes.' - '.$deposits.' - '.$remaintopay);exit;
 
-                            //Invoice types that are eligible for changing status to paid
+							//Invoice types that are eligible for changing status to paid
 							$affected_types = array(
 								Facture::TYPE_STANDARD,
 								Facture::TYPE_REPLACEMENT,
@@ -333,15 +333,15 @@ 
 								Facture::TYPE_SITUATION
 							);
 
-                            if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
-                            elseif ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
-                            //else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
-                            else {
-                                // If invoice is a down payment, we also convert down payment to discount
-                                if ($invoice->type == Facture::TYPE_DEPOSIT)
-                                {
-			                        $amount_ht = $amount_tva = $amount_ttc = array();
-			                        $multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
+							if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
+							elseif ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
+							//else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
+							else {
+								// If invoice is a down payment, we also convert down payment to discount
+								if ($invoice->type == Facture::TYPE_DEPOSIT)
+								{
+									$amount_ht = $amount_tva = $amount_ttc = array();
+									$multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
 
 									// Insert one discount by VAT rate category
 									$discount = new DiscountAbsolute($this->db);
@@ -382,48 +382,48 @@ 
 										}
 									}
 
-                                    if ($error)
-                                    {
-                                        setEventMessages($discount->error, $discount->errors, 'errors');
-                                        $error++;
-                                    }
-                                }
-
-                                // Set invoice to paid
-                                if (!$error)
-                                {
-                                    $result = $invoice->set_paid($user, '', '');
-                                    if ($result < 0)
-                                    {
-                                        $this->error = $invoice->error;
-                                        $error++;
-                                    }
-                                }
-                            }
-					    }
-
-					    // Regenerate documents of invoices
-                        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-                        {
-                        	dol_syslog(get_class($this).'::create Regenerate the document after inserting payment for thirdparty default_lang='.(is_object($invoice->thirdparty) ? $invoice->thirdparty->default_lang : 'null'), LOG_DEBUG);
-
-                            $newlang = '';
-                            $outputlangs = $langs;
-                            if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
-                            	$invoice->fetch_thirdparty();
-                            	$newlang = $invoice->thirdparty->default_lang;
-                            }
-                            if (!empty($newlang)) {
-                            	$outputlangs = new Translate("", $conf);
-                            	$outputlangs->setDefaultLang($newlang);
-                            }
-                            $ret = $invoice->fetch($facid); // Reload to get new records
-                            $result = $invoice->generateDocument($invoice->modelpdf, $outputlangs);
-                            if ($result < 0) {
-                            	setEventMessages($invoice->error, $invoice->errors, 'errors');
-                            	$error++;
-                            }
-                        }
+									if ($error)
+									{
+										setEventMessages($discount->error, $discount->errors, 'errors');
+										$error++;
+									}
+								}
+
+								// Set invoice to paid
+								if (!$error)
+								{
+									$result = $invoice->set_paid($user, '', '');
+									if ($result < 0)
+									{
+										$this->error = $invoice->error;
+										$error++;
+									}
+								}
+							}
+						}
+
+						// Regenerate documents of invoices
+						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+						{
+							dol_syslog(get_class($this).'::create Regenerate the document after inserting payment for thirdparty default_lang='.(is_object($invoice->thirdparty) ? $invoice->thirdparty->default_lang : 'null'), LOG_DEBUG);
+
+							$newlang = '';
+							$outputlangs = $langs;
+							if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+								$invoice->fetch_thirdparty();
+								$newlang = $invoice->thirdparty->default_lang;
+							}
+							if (!empty($newlang)) {
+								$outputlangs = new Translate("", $conf);
+								$outputlangs->setDefaultLang($newlang);
+							}
+							$ret = $invoice->fetch($facid); // Reload to get new records
+							$result = $invoice->generateDocument($invoice->modelpdf, $outputlangs);
+							if ($result < 0) {
+								setEventMessages($invoice->error, $invoice->errors, 'errors');
+								$error++;
+							}
+						}
 					} else {
 						$this->error = $this->db->lasterror();
 						$error++;
@@ -447,9 +447,9 @@ 
 
 		if (!$error)
 		{
-		    $this->amount = $total;
-		    $this->total = $total; // deprecated
-		    $this->multicurrency_amount = $mtotal;
+			$this->amount = $total;
+			$this->total = $total; // deprecated
+			$this->multicurrency_amount = $mtotal;
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -467,7 +467,7 @@ 
 	 *  @param	int		$notrigger		No trigger
 	 *  @return int     				<0 si ko, >0 si ok
 	 */
-    public function delete($notrigger = 0)
+	public function delete($notrigger = 0)
 	{
 		global $conf, $user, $langs;
 
@@ -503,16 +503,16 @@ 
 				$accline->id = $accline->rowid = $bank_line_id;    // If not found, we set artificially rowid to allow delete of llx_bank_url
 			}
 
-            // Delete bank account url lines linked to payment
+			// Delete bank account url lines linked to payment
 			$result = $accline->delete_urls($user);
-            if ($result < 0)
-            {
-                $this->error = $accline->error;
+			if ($result < 0)
+			{
+				$this->error = $accline->error;
 				$this->db->rollback();
 				return -3;
-            }
+			}
 
-            // Delete bank account lines linked to payment
+			// Delete bank account lines linked to payment
 			$result = $accline->delete($user);
 			if ($result < 0)
 			{
@@ -528,10 +528,10 @@ 
 			$result = $this->call_trigger('PAYMENT_CUSTOMER_DELETE', $user);
 			if ($result < 0)
 			{
-			    $this->db->rollback();
-			    return -1;
-            }
-            // End call triggers
+				$this->db->rollback();
+				return -1;
+			}
+			// End call triggers
 		}
 
 		// Delete payment (into paiement_facture and paiement)
@@ -543,7 +543,7 @@ 
 		{
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiement';
 			$sql .= ' WHERE rowid = '.$this->id;
-		    dol_syslog($sql);
+			dol_syslog($sql);
 			$result = $this->db->query($sql);
 			if (!$result)
 			{
@@ -562,144 +562,144 @@ 
 	}
 
 
-    /**
-     *      Add a record into bank for payment + links between this bank record and sources of payment.
-     *      All payment properties (this->amount, this->amounts, ...) must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  string	$mode               'payment', 'payment_supplier'
-     *      @param  string	$label              Label to use in bank record. Note: If label is '(WithdrawalPayment)', a third entry 'widthdraw' is added into bank_url.
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @param	int		$notrigger			No trigger
-     *      @return int                 		<0 if KO, bank_line_id if OK
-     */
-    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque, $notrigger = 0)
-    {
-        global $conf, $langs, $user;
+	/**
+	 *      Add a record into bank for payment + links between this bank record and sources of payment.
+	 *      All payment properties (this->amount, this->amounts, ...) must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  string	$mode               'payment', 'payment_supplier'
+	 *      @param  string	$label              Label to use in bank record. Note: If label is '(WithdrawalPayment)', a third entry 'widthdraw' is added into bank_url.
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @param	int		$notrigger			No trigger
+	 *      @return int                 		<0 if KO, bank_line_id if OK
+	 */
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque, $notrigger = 0)
+	{
+		global $conf, $langs, $user;
 
-        $error = 0;
-        $bank_line_id = 0;
+		$error = 0;
+		$bank_line_id = 0;
 
-        if (!empty($conf->banque->enabled))
-        {
-        	if ($accountid <= 0)
-        	{
-        		$this->error = 'Bad value for parameter accountid='.$accountid;
-        		dol_syslog(get_class($this).'::addPaymentToBank '.$this->error, LOG_ERR);
-        		return -1;
-        	}
+		if (!empty($conf->banque->enabled))
+		{
+			if ($accountid <= 0)
+			{
+				$this->error = 'Bad value for parameter accountid='.$accountid;
+				dol_syslog(get_class($this).'::addPaymentToBank '.$this->error, LOG_ERR);
+				return -1;
+			}
 
-        	$this->db->begin();
+			$this->db->begin();
 
-        	$this->fk_account = $accountid;
+			$this->fk_account = $accountid;
 
-        	include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-            dol_syslog("$user->id, $mode, $label, $this->fk_account, $emetteur_nom, $emetteur_banque");
+			dol_syslog("$user->id, $mode, $label, $this->fk_account, $emetteur_nom, $emetteur_banque");
 
-            $acc = new Account($this->db);
-            $result = $acc->fetch($this->fk_account);
+			$acc = new Account($this->db);
+			$result = $acc->fetch($this->fk_account);
 
 			$totalamount = $this->amount;
-            if (empty($totalamount)) $totalamount = $this->total; // For backward compatibility
-
-            // if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
-            if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) $totalamount = $this->multicurrency_amount;
-
-            if ($mode == 'payment_supplier') $totalamount = -$totalamount;
-
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaye,
-                $this->paiementid, // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                $totalamount, // Sign must be positive when we receive money (customer payment), negative when you give money (supplier invoice or credit note)
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
-
-            // Mise a jour fk_bank dans llx_paiement
-            // On connait ainsi le paiement qui a genere l'ecriture bancaire
-            if ($bank_line_id > 0)
-            {
-                $result = $this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
-
-                // Add link 'payment', 'payment_supplier' in bank_url between payment and bank transaction
-                if (!$error)
-                {
-                    $url = '';
-                    if ($mode == 'payment') $url = DOL_URL_ROOT.'/compta/paiement/card.php?id=';
-                    if ($mode == 'payment_supplier') $url = DOL_URL_ROOT.'/fourn/paiement/card.php?id=';
-                    if ($url)
-                    {
-                        $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-                        if ($result <= 0)
-                        {
-                            $error++;
-                            dol_print_error($this->db);
-                        }
-                    }
-                }
-
-                // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-                //if (! $error && $label != '(WithdrawalPayment)')
-                if (!$error)
-                {
-                    $linkaddedforthirdparty = array();
-                    foreach ($this->amounts as $key => $value)  // We should have invoices always for same third party but we loop in case of.
-                    {
-                        if ($mode == 'payment')
-                        {
-                            $fac = new Facture($this->db);
-                            $fac->fetch($key);
-                            $fac->fetch_thirdparty();
-                            if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
-                            {
-                                $result = $acc->add_url_line(
-                                    $bank_line_id,
-                                    $fac->thirdparty->id,
-                                    DOL_URL_ROOT.'/comm/card.php?socid=',
-                                    $fac->thirdparty->name,
-                                    'company'
-                                );
-                                if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
-                                $linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
-                            }
-                        }
-                        if ($mode == 'payment_supplier')
-                        {
-                            $fac = new FactureFournisseur($this->db);
-                            $fac->fetch($key);
-                            $fac->fetch_thirdparty();
-                            if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
-                            {
-                                $result = $acc->add_url_line(
-                                    $bank_line_id,
-                                    $fac->thirdparty->id,
-                                    DOL_URL_ROOT.'/fourn/card.php?socid=',
-                                    $fac->thirdparty->name,
-                                    'company'
-                                );
-                                if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
-                                $linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
-                            }
-                        }
-                    }
-                }
+			if (empty($totalamount)) $totalamount = $this->total; // For backward compatibility
+
+			// if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
+			if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) $totalamount = $this->multicurrency_amount;
+
+			if ($mode == 'payment_supplier') $totalamount = -$totalamount;
+
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaye,
+				$this->paiementid, // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				$totalamount, // Sign must be positive when we receive money (customer payment), negative when you give money (supplier invoice or credit note)
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
+
+			// Mise a jour fk_bank dans llx_paiement
+			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			if ($bank_line_id > 0)
+			{
+				$result = $this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
+
+				// Add link 'payment', 'payment_supplier' in bank_url between payment and bank transaction
+				if (!$error)
+				{
+					$url = '';
+					if ($mode == 'payment') $url = DOL_URL_ROOT.'/compta/paiement/card.php?id=';
+					if ($mode == 'payment_supplier') $url = DOL_URL_ROOT.'/fourn/paiement/card.php?id=';
+					if ($url)
+					{
+						$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+						if ($result <= 0)
+						{
+							$error++;
+							dol_print_error($this->db);
+						}
+					}
+				}
+
+				// Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
+				//if (! $error && $label != '(WithdrawalPayment)')
+				if (!$error)
+				{
+					$linkaddedforthirdparty = array();
+					foreach ($this->amounts as $key => $value)  // We should have invoices always for same third party but we loop in case of.
+					{
+						if ($mode == 'payment')
+						{
+							$fac = new Facture($this->db);
+							$fac->fetch($key);
+							$fac->fetch_thirdparty();
+							if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
+							{
+								$result = $acc->add_url_line(
+									$bank_line_id,
+									$fac->thirdparty->id,
+									DOL_URL_ROOT.'/comm/card.php?socid=',
+									$fac->thirdparty->name,
+									'company'
+								);
+								if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+								$linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
+							}
+						}
+						if ($mode == 'payment_supplier')
+						{
+							$fac = new FactureFournisseur($this->db);
+							$fac->fetch($key);
+							$fac->fetch_thirdparty();
+							if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
+							{
+								$result = $acc->add_url_line(
+									$bank_line_id,
+									$fac->thirdparty->id,
+									DOL_URL_ROOT.'/fourn/card.php?socid=',
+									$fac->thirdparty->name,
+									'company'
+								);
+								if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+								$linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
+							}
+						}
+					}
+				}
 
 				// Add link 'WithdrawalPayment' in bank_url
 				if (!$error && $label == '(WithdrawalPayment)') {
-                    $result = $acc->add_url_line(
+					$result = $acc->add_url_line(
 						$bank_line_id,
 						$this->id_prelevement,
 						DOL_URL_ROOT.'/compta/prelevement/card.php?id=',
@@ -708,45 +708,45 @@ 
 					);
 				}
 
-	            if (!$error && !$notrigger)
+				if (!$error && !$notrigger)
 				{
 					// Appel des triggers
 					$result = $this->call_trigger('PAYMENT_ADD_TO_BANK', $user);
-				    if ($result < 0) { $error++; }
-				    // Fin appel triggers
+					if ($result < 0) { $error++; }
+					// Fin appel triggers
 				}
-            } else {
-                $this->error = $acc->error;
-                $error++;
-            }
-
-            if (!$error)
-            {
-            	$this->db->commit();
-            } else {
-            	$this->db->rollback();
-            }
-        }
-
-        if (!$error)
-        {
-            return $bank_line_id;
-        } else {
-            return -1;
-        }
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+			} else {
+				$this->error = $acc->error;
+				$error++;
+			}
+
+			if (!$error)
+			{
+				$this->db->commit();
+			} else {
+				$this->db->rollback();
+			}
+		}
+
+		if (!$error)
+		{
+			return $bank_line_id;
+		} else {
+			return -1;
+		}
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Mise a jour du lien entre le paiement et la ligne generee dans llx_bank
 	 *
 	 *      @param	int		$id_bank    Id compte bancaire
 	 *      @return	int					<0 if KO, >0 if OK
 	 */
-    public function update_fk_bank($id_bank)
+	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' set fk_bank = '.$id_bank;
 		$sql .= ' WHERE rowid = '.$this->id;
 
@@ -756,102 +756,102 @@ 
 		{
 			return 1;
 		} else {
-            $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this).'::update_fk_bank '.$this->error);
+			$this->error = $this->db->lasterror();
+			dol_syslog(get_class($this).'::update_fk_bank '.$this->error);
 			return -1;
 		}
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Updates the payment date
-     *
-     *  @param	int	$date   New date
-     *  @return int					<0 if KO, 0 if OK
-     */
-    public function update_date($date)
-    {
-        // phpcs:enable
-        $error = 0;
-
-        if (!empty($date) && $this->statut != 1)
-        {
-            $this->db->begin();
-
-            dol_syslog(get_class($this)."::update_date with date = ".$date, LOG_DEBUG);
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " SET datep = '".$this->db->idate($date)."'";
-            $sql .= " WHERE rowid = ".$this->id;
-
-            $result = $this->db->query($sql);
-            if (!$result)
-            {
-                $error++;
-                $this->error = 'Error -1 '.$this->db->error();
-            }
-
-            $type = $this->element;
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX.'bank';
-            $sql .= " SET dateo = '".$this->db->idate($date)."', datev = '".$this->db->idate($date)."'";
-            $sql .= " WHERE rowid IN (SELECT fk_bank FROM ".MAIN_DB_PREFIX."bank_url WHERE type = '".$type."' AND url_id = ".$this->id.")";
-            $sql .= " AND rappro = 0";
-
-            $result = $this->db->query($sql);
-            if (!$result)
-            {
-                $error++;
-                $this->error = 'Error -1 '.$this->db->error();
-            }
-
-            if (!$error)
-            {
-            }
-
-            if (!$error)
-            {
-                $this->datepaye = $date;
-                $this->date = $date;
-
-                $this->db->commit();
-                return 0;
-            } else {
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        return -1; //no date given or already validated
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Updates the payment number
-     *
-     *  @param	string	$num		New num
-     *  @return int					<0 if KO, 0 if OK
-     */
-    public function update_num($num)
-    {
-        // phpcs:enable
-        if (!empty($num) && $this->statut != 1) {
-            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " SET num_paiement = '".$this->db->escape($num)."'";
-            $sql .= " WHERE rowid = ".$this->id;
-
-            dol_syslog(get_class($this)."::update_num", LOG_DEBUG);
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-            	$this->num_payment = $this->db->escape($num);
-                return 0;
-            } else {
-                $this->error = 'Error -1 '.$this->db->error();
-                return -2;
-            }
-        }
-        return -1; //no num given or already validated
-    }
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Updates the payment date
+	 *
+	 *  @param	int	$date   New date
+	 *  @return int					<0 if KO, 0 if OK
+	 */
+	public function update_date($date)
+	{
+		// phpcs:enable
+		$error = 0;
+
+		if (!empty($date) && $this->statut != 1)
+		{
+			$this->db->begin();
+
+			dol_syslog(get_class($this)."::update_date with date = ".$date, LOG_DEBUG);
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET datep = '".$this->db->idate($date)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+
+			$result = $this->db->query($sql);
+			if (!$result)
+			{
+				$error++;
+				$this->error = 'Error -1 '.$this->db->error();
+			}
+
+			$type = $this->element;
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX.'bank';
+			$sql .= " SET dateo = '".$this->db->idate($date)."', datev = '".$this->db->idate($date)."'";
+			$sql .= " WHERE rowid IN (SELECT fk_bank FROM ".MAIN_DB_PREFIX."bank_url WHERE type = '".$type."' AND url_id = ".$this->id.")";
+			$sql .= " AND rappro = 0";
+
+			$result = $this->db->query($sql);
+			if (!$result)
+			{
+				$error++;
+				$this->error = 'Error -1 '.$this->db->error();
+			}
+
+			if (!$error)
+			{
+			}
+
+			if (!$error)
+			{
+				$this->datepaye = $date;
+				$this->date = $date;
+
+				$this->db->commit();
+				return 0;
+			} else {
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		return -1; //no date given or already validated
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Updates the payment number
+	 *
+	 *  @param	string	$num		New num
+	 *  @return int					<0 if KO, 0 if OK
+	 */
+	public function update_num($num)
+	{
+		// phpcs:enable
+		if (!empty($num) && $this->statut != 1) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET num_paiement = '".$this->db->escape($num)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+
+			dol_syslog(get_class($this)."::update_num", LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$this->num_payment = $this->db->escape($num);
+				return 0;
+			} else {
+				$this->error = 'Error -1 '.$this->db->error();
+				return -2;
+			}
+		}
+		return -1; //no num given or already validated
+	}
 
 	/**
 	 *    Validate payment
@@ -859,8 +859,8 @@ 
 	 *	  @param	User	$user		User making validation
 	 *    @return   int     			<0 if KO, >0 if OK
 	 */
-    public function valide(User $user = null)
-    {
+	public function valide(User $user = null)
+	{
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 1 WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this).'::valide', LOG_DEBUG);
@@ -873,7 +873,7 @@ 
 			dol_syslog(get_class($this).'::valide '.$this->error);
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *    Reject payment
@@ -881,8 +881,8 @@ 
 	 *	  @param	User	$user		User making reject
 	 *    @return   int     			<0 if KO, >0 if OK
 	 */
-    public function reject(User $user = null)
-    {
+	public function reject(User $user = null)
+	{
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 2 WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this).'::reject', LOG_DEBUG);
@@ -895,7 +895,7 @@ 
 			dol_syslog(get_class($this).'::reject '.$this->error);
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *    Information sur l'objet
@@ -903,8 +903,8 @@ 
 	 *    @param   int     $id      id du paiement dont il faut afficher les infos
 	 *    @return  void
 	 */
-    public function info($id)
-    {
+	public function info($id)
+	{
 		$sql = 'SELECT p.rowid, p.datec, p.fk_user_creat, p.fk_user_modif, p.tms';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p';
 		$sql .= ' WHERE p.rowid = '.$id;
@@ -937,7 +937,7 @@ 
 		} else {
 			dol_print_error($this->db);
 		}
-    }
+	}
 
 	/**
 	 *  Return list of invoices the payment is related to.
@@ -945,8 +945,8 @@ 
 	 *  @param	string		$filter         Filter
 	 *  @return int|array					<0 if KO or array of invoice id
 	 */
-    public function getBillsArray($filter = '')
-    {
+	public function getBillsArray($filter = '')
+	{
 		$sql = 'SELECT pf.fk_facture';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'facture as f'; // We keep link on invoice to allow use of some filters on invoice
 		$sql .= ' WHERE pf.fk_facture = f.rowid AND pf.fk_paiement = '.$this->id;
@@ -971,39 +971,39 @@ 
 			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' -', LOG_DEBUG);
 			return -1;
 		}
-    }
-
-    /**
-     *  Return list of amounts of payments.
-     *
-     *  @return int|array					Array of amount of payments
-     */
-    public function getAmountsArray()
-    {
-    	$sql = 'SELECT pf.fk_facture, pf.amount';
-    	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
-    	$sql .= ' WHERE pf.fk_paiement = '.$this->id;
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$i = 0;
-    		$num = $this->db->num_rows($resql);
-    		$amounts = array();
-
-    		while ($i < $num)
-    		{
-    			$obj = $this->db->fetch_object($resql);
-    			$amounts[$obj->fk_facture] = $obj->amount;
-    			$i++;
-    		}
-
-    		return $amounts;
-    	} else {
-    		$this->error = $this->db->error();
-    		dol_syslog(get_class($this).'::getAmountsArray Error '.$this->error.' -', LOG_DEBUG);
-    		return -1;
-    	}
-    }
+	}
+
+	/**
+	 *  Return list of amounts of payments.
+	 *
+	 *  @return int|array					Array of amount of payments
+	 */
+	public function getAmountsArray()
+	{
+		$sql = 'SELECT pf.fk_facture, pf.amount';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
+		$sql .= ' WHERE pf.fk_paiement = '.$this->id;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($resql);
+			$amounts = array();
+
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$amounts[$obj->fk_facture] = $obj->amount;
+				$i++;
+			}
+
+			return $amounts;
+		} else {
+			$this->error = $this->db->error();
+			dol_syslog(get_class($this).'::getAmountsArray Error '.$this->error.' -', LOG_DEBUG);
+			return -1;
+		}
+	}
 
 	/**
 	 *      Return next reference of customer invoice not already used (or last reference)
@@ -1013,7 +1013,7 @@ 
 	 *      @param     string		$mode		'next' for next value or 'last' for last value
 	 *      @return    string					free ref or last ref
 	 */
-    public function getNextNumRef($soc, $mode = 'next')
+	public function getNextNumRef($soc, $mode = 'next')
 	{
 		global $conf, $db, $langs;
 		$langs->load("bills");
@@ -1093,7 +1093,7 @@ 
 	 *
 	 * 	@return 	string 	'dolibarr' if standard comportment or paid in main currency, 'customer' if payment received from multicurrency inputs
 	 */
-    public function getWay()
+	public function getWay()
 	{
 		global $conf;
 
@@ -1121,7 +1121,7 @@ 
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
 	 *  @return	void
 	 */
-    public function initAsSpecimen($option = '')
+	public function initAsSpecimen($option = '')
 	{
 		global $user, $langs, $conf;
 
@@ -1144,50 +1144,50 @@ 
 	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	string	$option			Sur quoi pointe le lien
 	 *  @param  string  $mode           'withlistofinvoices'=Include list of invoices into tooltip
-     *  @param	int  	$notooltip		1=Disable tooltip
+	 *  @param	int  	$notooltip		1=Disable tooltip
 	 *	@return	string					Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0)
 	{
 		global $conf, $langs;
 
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
-        $label = '<u>'.$langs->trans("Payment").'</u><br>';
-        $label .= '<strong>'.$langs->trans("Ref").':</strong> '.$this->ref;
-        if ($this->datepaye ? $this->datepaye : $this->date) $label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
-        if ($mode == 'withlistofinvoices')
-        {
-            $arraybill = $this->getBillsArray();
-            if (is_array($arraybill) && count($arraybill) > 0)
-            {
-            	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-            	$facturestatic = new Facture($this->db);
-            	foreach ($arraybill as $billid)
-            	{
-            		$facturestatic->fetch($billid);
-            		$label .= '<br> '.$facturestatic->getNomUrl(1).' '.$facturestatic->getLibStatut(2, 1);
-            	}
-            }
-        }
-
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
-
-        $url = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id;
-
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
+		$label = '<u>'.$langs->trans("Payment").'</u><br>';
+		$label .= '<strong>'.$langs->trans("Ref").':</strong> '.$this->ref;
+		if ($this->datepaye ? $this->datepaye : $this->date) $label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+		if ($mode == 'withlistofinvoices')
+		{
+			$arraybill = $this->getBillsArray();
+			if (is_array($arraybill) && count($arraybill) > 0)
+			{
+				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+				$facturestatic = new Facture($this->db);
+				foreach ($arraybill as $billid)
+				{
+					$facturestatic->fetch($billid);
+					$label .= '<br> '.$facturestatic->getNomUrl(1).' '.$facturestatic->getLibStatut(2, 1);
+				}
+			}
+		}
+
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+
+		$url = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id;
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
@@ -1204,12 +1204,12 @@ 
 	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 * @return  string				Libelle
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Renvoi le libelle d'un statut donne
 	 *
@@ -1217,9 +1217,9 @@ 
 	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 * @return	string  		    Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
 		$langs->load('compta');
@@ -1261,16 +1261,16 @@ 
 		return '';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load the third party of object, from id into this->thirdparty
 	 *
 	 *	@param		int		$force_thirdparty_id	Force thirdparty id
 	 *	@return		int								<0 if KO, >0 if OK
 	 */
-    public function fetch_thirdparty($force_thirdparty_id = 0)
+	public function fetch_thirdparty($force_thirdparty_id = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 		if (empty($force_thirdparty_id))

Braces +84 added lines, -32 removed lines

@@ -168,12 +168,13 @@ 
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
 		$sql .= ' WHERE p.entity IN ('.getEntity('invoice').')';
-		if ($id > 0)
-			$sql .= ' AND p.rowid = '.$id;
-		elseif ($ref)
-			$sql .= " AND p.ref = '".$ref."'";
-		elseif ($fk_bank)
-			$sql .= ' AND p.fk_bank = '.$fk_bank;
+		if ($id > 0) {
+					$sql .= ' AND p.rowid = '.$id;
+		} elseif ($ref) {
+					$sql .= " AND p.ref = '".$ref."'";
+		} elseif ($fk_bank) {
+					$sql .= ' AND p.fk_bank = '.$fk_bank;
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -247,25 +248,31 @@ 
 			$amounts_to_update = &$this->amounts;
 		}
 
-		foreach ($amounts as $key => $value)	// How payment is dispatch
+		foreach ($amounts as $key => $value) {
+			// How payment is dispatch
 		{
 			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value, $way);
+		}
 			$totalamount_converted += $value_converted;
 			$amounts_to_update[$key] = price2num($value_converted, 'MT');
 
 			$newvalue = price2num($value, 'MT');
 			$amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
-			if (!empty($newvalue)) $atleastonepaymentnotnull++;
+			if (!empty($newvalue)) {
+				$atleastonepaymentnotnull++;
+			}
 		}
 
 		$totalamount = price2num($totalamount);
 		$totalamount_converted = price2num($totalamount_converted);
 
 		// Check parameters
-        if (empty($totalamount) && empty($atleastonepaymentnotnull))	 // We accept negative amounts for withdraw reject but not empty arrays
+        if (empty($totalamount) && empty($atleastonepaymentnotnull)) {
+        	// We accept negative amounts for withdraw reject but not empty arrays
         {
         	$this->errors[] = 'TotalAmountEmpty';
+        }
         	$this->error = 'TotalAmountEmpty';
         	return -1;
         }
@@ -333,8 +340,11 @@ 
 								Facture::TYPE_SITUATION
 							);
 
-                            if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
-                            elseif ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
+                            if (!in_array($invoice->type, $affected_types)) {
+                            	dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
+                            } elseif ($remaintopay) {
+                            	dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
+                            }
                             //else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
                             else {
                                 // If invoice is a down payment, we also convert down payment to discount
@@ -433,10 +443,12 @@ 
 				}
 			}
 
-			if (!$error)    // All payments into $this->amounts were recorded without errors
+			if (!$error) {
+				// All payments into $this->amounts were recorded without errors
 			{
 				// Appel des triggers
 				$result = $this->call_trigger('PAYMENT_CUSTOMER_CREATE', $user);
+			}
 				if ($result < 0) { $error++; }
 				// Fin appel triggers
 			}
@@ -603,12 +615,19 @@ 
             $result = $acc->fetch($this->fk_account);
 
 			$totalamount = $this->amount;
-            if (empty($totalamount)) $totalamount = $this->total; // For backward compatibility
+            if (empty($totalamount)) {
+            	$totalamount = $this->total;
+            }
+            // For backward compatibility
 
             // if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
-            if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) $totalamount = $this->multicurrency_amount;
+            if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) {
+            	$totalamount = $this->multicurrency_amount;
+            }
 
-            if ($mode == 'payment_supplier') $totalamount = -$totalamount;
+            if ($mode == 'payment_supplier') {
+            	$totalamount = -$totalamount;
+            }
 
             // Insert payment into llx_bank
             $bank_line_id = $acc->addline(
@@ -638,8 +657,12 @@ 
                 if (!$error)
                 {
                     $url = '';
-                    if ($mode == 'payment') $url = DOL_URL_ROOT.'/compta/paiement/card.php?id=';
-                    if ($mode == 'payment_supplier') $url = DOL_URL_ROOT.'/fourn/paiement/card.php?id=';
+                    if ($mode == 'payment') {
+                    	$url = DOL_URL_ROOT.'/compta/paiement/card.php?id=';
+                    }
+                    if ($mode == 'payment_supplier') {
+                    	$url = DOL_URL_ROOT.'/fourn/paiement/card.php?id=';
+                    }
                     if ($url)
                     {
                         $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
@@ -656,14 +679,17 @@ 
                 if (!$error)
                 {
                     $linkaddedforthirdparty = array();
-                    foreach ($this->amounts as $key => $value)  // We should have invoices always for same third party but we loop in case of.
+                    foreach ($this->amounts as $key => $value) {
+                    	// We should have invoices always for same third party but we loop in case of.
                     {
                         if ($mode == 'payment')
                         {
                             $fac = new Facture($this->db);
+                    }
                             $fac->fetch($key);
                             $fac->fetch_thirdparty();
-                            if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
+                            if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) {
+                            	// Not yet done for this thirdparty
                             {
                                 $result = $acc->add_url_line(
                                     $bank_line_id,
@@ -672,7 +698,10 @@ 
                                     $fac->thirdparty->name,
                                     'company'
                                 );
-                                if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+                            }
+                                if ($result <= 0) {
+                                	dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+                                }
                                 $linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
                             }
                         }
@@ -681,7 +710,8 @@ 
                             $fac = new FactureFournisseur($this->db);
                             $fac->fetch($key);
                             $fac->fetch_thirdparty();
-                            if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
+                            if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) {
+                            	// Not yet done for this thirdparty
                             {
                                 $result = $acc->add_url_line(
                                     $bank_line_id,
@@ -690,7 +720,10 @@ 
                                     $fac->thirdparty->name,
                                     'company'
                                 );
-                                if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+                            }
+                                if ($result <= 0) {
+                                	dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+                                }
                                 $linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
                             }
                         }
@@ -950,7 +983,9 @@ 
 		$sql = 'SELECT pf.fk_facture';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'facture as f'; // We keep link on invoice to allow use of some filters on invoice
 		$sql .= ' WHERE pf.fk_facture = f.rowid AND pf.fk_paiement = '.$this->id;
-		if ($filter) $sql .= ' AND '.$filter;
+		if ($filter) {
+			$sql .= ' AND '.$filter;
+		}
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1019,9 +1054,13 @@ 
 		$langs->load("bills");
 
 		// Clean parameters (if not defined or using deprecated value)
-		if (empty($conf->global->PAYMENT_ADDON)) $conf->global->PAYMENT_ADDON = 'mod_payment_cicada';
-		elseif ($conf->global->PAYMENT_ADDON == 'ant') $conf->global->PAYMENT_ADDON = 'mod_payment_ant';
-		elseif ($conf->global->PAYMENT_ADDON == 'cicada') $conf->global->PAYMENT_ADDON = 'mod_payment_cicada';
+		if (empty($conf->global->PAYMENT_ADDON)) {
+			$conf->global->PAYMENT_ADDON = 'mod_payment_cicada';
+		} elseif ($conf->global->PAYMENT_ADDON == 'ant') {
+			$conf->global->PAYMENT_ADDON = 'mod_payment_ant';
+		} elseif ($conf->global->PAYMENT_ADDON == 'cicada') {
+			$conf->global->PAYMENT_ADDON = 'mod_payment_cicada';
+		}
 
 		if (!empty($conf->global->PAYMENT_ADDON))
 		{
@@ -1102,9 +1141,11 @@ 
 		{
 			foreach ($this->multicurrency_amounts as $value)
 			{
-				if (!empty($value)) // one value found then payment is in invoice currency
+				if (!empty($value)) {
+					// one value found then payment is in invoice currency
 				{
 					$way = 'customer';
+				}
 					break;
 				}
 			}
@@ -1151,12 +1192,17 @@ 
 	{
 		global $conf, $langs;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1;
+		}
+		// Force disable tooltips
 
 		$result = '';
         $label = '<u>'.$langs->trans("Payment").'</u><br>';
         $label .= '<strong>'.$langs->trans("Ref").':</strong> '.$this->ref;
-        if ($this->datepaye ? $this->datepaye : $this->date) $label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+        if ($this->datepaye ? $this->datepaye : $this->date) {
+        	$label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+        }
         if ($mode == 'withlistofinvoices')
         {
             $arraybill = $this->getBillsArray();
@@ -1182,7 +1228,9 @@ 
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else {
+        	$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        }
 
         $url = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id;
 
@@ -1191,8 +1239,12 @@ 
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto && $withpicto != 2) $result .= ($this->ref ? $this->ref : $this->id);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result .= ($this->ref ? $this->ref : $this->id);
+		}
 		$result .= $linkend;
 
 		return $result;

htdocs/compta/sociales/class/paymentsocialcontribution.class.php

Indentation +145 added lines, -145 removed lines

@@ -47,8 +47,8 @@ 
 	public $picto = 'payment';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_charge;
 
 	public $datec = '';
@@ -61,12 +61,12 @@ 
 	 */
 	public $total;
 
-    public $amount; // Total amount of payment
-    public $amounts = array(); // Array of amounts
+	public $amount; // Total amount of payment
+	public $amounts = array(); // Array of amounts
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_typepaiement;
 
 	/**
@@ -81,18 +81,18 @@ 
 	public $num_payment;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**
@@ -107,8 +107,8 @@ 
 
 	/**
 	 *  Create payment of social contribution into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User	$user   				User making payment
 	 *	@param		int		$closepaidcontrib   	1=Also close payed contributions to paid, 0=Do nothing more
 	 *  @return     int     						<0 if KO, id of payment if OK
@@ -119,7 +119,7 @@ 
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 
@@ -141,17 +141,17 @@ 
 		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
 		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
 
-        $totalamount = 0;
-        foreach ($this->amounts as $key => $value)  // How payment is dispatch
-        {
-            $newvalue = price2num($value, 'MT');
-            $this->amounts[$key] = $newvalue;
-            $totalamount += $newvalue;
-        }
-        $totalamount = price2num($totalamount);
+		$totalamount = 0;
+		foreach ($this->amounts as $key => $value)  // How payment is dispatch
+		{
+			$newvalue = price2num($value, 'MT');
+			$this->amounts[$key] = $newvalue;
+			$totalamount += $newvalue;
+		}
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		// Check parameters
+		if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
 
 
 		$this->db->begin();
@@ -208,9 +208,9 @@ 
 
 		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount = $totalamount;
-            $this->total = $totalamount; // deprecated
-		    $this->db->commit();
+			$this->amount = $totalamount;
+			$this->total = $totalamount; // deprecated
+			$this->db->commit();
 			return $this->id;
 		} else {
 			$this->error = $this->db->error();
@@ -374,16 +374,16 @@ 
 
 		$this->db->begin();
 
-	    if ($this->bank_line > 0)
-        {
-        	$accline = new AccountLine($this->db);
+		if ($this->bank_line > 0)
+		{
+			$accline = new AccountLine($this->db);
 			$accline->fetch($this->bank_line);
 			$result = $accline->delete();
 			if ($result < 0) {
 				$this->errors[] = $accline->error;
 				$error++;
 			}
-        }
+		}
 
 		if (!$error)
 		{
@@ -462,11 +462,11 @@ 
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -487,102 +487,102 @@ 
 	}
 
 
-    /**
-     *      Add record into bank for payment with links between this bank record and invoices of payment.
-     *      All payment properties must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  string	$mode               'payment_sc'
-     *      @param  string	$label              Label to use in bank record
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
-    {
-        global $conf;
+	/**
+	 *      Add record into bank for payment with links between this bank record and invoices of payment.
+	 *      All payment properties must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  string	$mode               'payment_sc'
+	 *      @param  string	$label              Label to use in bank record
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+	{
+		global $conf;
 
 		// Clean data
-        $this->num_payment = trim($this->num_payment ? $this->num_payment : $this->num_paiement);
-
-        $error = 0;
-
-        if (!empty($conf->banque->enabled))
-        {
-            include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-            $acc = new Account($this->db);
-            $acc->fetch($accountid);
-
-            $total = $this->total;
-            if ($mode == 'payment_sc') $total = -$total;
-
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaye,
-                $this->paiementtype, // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                $total,
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
-
-            // Mise a jour fk_bank dans llx_paiement.
-            // On connait ainsi le paiement qui a genere l'ecriture bancaire
-            if ($bank_line_id > 0)
-            {
-                $result = $this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
-
-                // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
-                $url = '';
-                if ($mode == 'payment_sc') $url = DOL_URL_ROOT.'/compta/payment_sc/card.php?id=';
-                if ($url)
-                {
-                    $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-                    if ($result <= 0)
-                    {
-                        $error++;
-                        dol_print_error($this->db);
-                    }
-                }
-
-                // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-                $linkaddedforthirdparty = array();
-                foreach ($this->amounts as $key => $value)
-                {
-                    if ($mode == 'payment_sc')
-                    {
-                        $socialcontrib = new ChargeSociales($this->db);
-                        $socialcontrib->fetch($key);
-                        $result = $acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib != $socialcontrib->type_label) ? ' ('.$socialcontrib->lib.')' : ''), 'sc');
-                        if ($result <= 0) dol_print_error($this->db);
-                    }
-                }
-            } else {
-                $this->error = $acc->error;
-                $error++;
-            }
-        }
-
-        if (!$error)
-        {
-            return 1;
-        } else {
-            return -1;
-        }
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+		$this->num_payment = trim($this->num_payment ? $this->num_payment : $this->num_paiement);
+
+		$error = 0;
+
+		if (!empty($conf->banque->enabled))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+			$acc = new Account($this->db);
+			$acc->fetch($accountid);
+
+			$total = $this->total;
+			if ($mode == 'payment_sc') $total = -$total;
+
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaye,
+				$this->paiementtype, // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				$total,
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
+
+			// Mise a jour fk_bank dans llx_paiement.
+			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			if ($bank_line_id > 0)
+			{
+				$result = $this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
+
+				// Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
+				$url = '';
+				if ($mode == 'payment_sc') $url = DOL_URL_ROOT.'/compta/payment_sc/card.php?id=';
+				if ($url)
+				{
+					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+					if ($result <= 0)
+					{
+						$error++;
+						dol_print_error($this->db);
+					}
+				}
+
+				// Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
+				$linkaddedforthirdparty = array();
+				foreach ($this->amounts as $key => $value)
+				{
+					if ($mode == 'payment_sc')
+					{
+						$socialcontrib = new ChargeSociales($this->db);
+						$socialcontrib->fetch($key);
+						$result = $acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib != $socialcontrib->type_label) ? ' ('.$socialcontrib->lib.')' : ''), 'sc');
+						if ($result <= 0) dol_print_error($this->db);
+					}
+				}
+			} else {
+				$this->error = $acc->error;
+				$error++;
+			}
+		}
+
+		if (!$error)
+		{
+			return 1;
+		} else {
+			return -1;
+		}
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Mise a jour du lien entre le paiement de  charge et la ligne dans llx_bank generee
 	 *
@@ -591,7 +591,7 @@ 
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."paiementcharge SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
@@ -617,7 +617,7 @@ 
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Renvoi le libelle d'un statut donne
 	 *
@@ -627,7 +627,7 @@ 
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
 		$langs->load('compta');
@@ -683,17 +683,17 @@ 
 		$result = '';
 
 		if (empty($this->ref)) $this->ref = $this->lib;
-        $label = $langs->trans("Payment").': '.$this->ref;
+		$label = $langs->trans("Payment").': '.$this->ref;
 
-        if (!empty($this->id)) {
-            $link = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend = '</a>';
+		if (!empty($this->id)) {
+			$link = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+			$linkend = '</a>';
 
-            if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
-            if ($withpicto && $withpicto != 2) $result .= ' ';
-            if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
-        }
+			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			if ($withpicto && $withpicto != 2) $result .= ' ';
+			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

Braces +90 added lines, -29 removed lines

@@ -131,27 +131,51 @@ 
 		}
 
 		// Clean parameters
-		if (isset($this->fk_charge)) $this->fk_charge = (int) $this->fk_charge;
-		if (isset($this->amount)) $this->amount = trim($this->amount);
-		if (isset($this->fk_typepaiement)) $this->fk_typepaiement = (int) $this->fk_typepaiement;
-		if (isset($this->num_paiement)) $this->num_paiement = trim($this->num_paiement); // deprecated
-		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-		if (isset($this->note)) $this->note = trim($this->note);
-		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_charge)) {
+			$this->fk_charge = (int) $this->fk_charge;
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepaiement)) {
+			$this->fk_typepaiement = (int) $this->fk_typepaiement;
+		}
+		if (isset($this->num_paiement)) {
+			$this->num_paiement = trim($this->num_paiement);
+		}
+		// deprecated
+		if (isset($this->num_payment)) {
+			$this->num_payment = trim($this->num_payment);
+		}
+		if (isset($this->note)) {
+			$this->note = trim($this->note);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
         $totalamount = 0;
-        foreach ($this->amounts as $key => $value)  // How payment is dispatch
+        foreach ($this->amounts as $key => $value) {
+        	// How payment is dispatch
         {
             $newvalue = price2num($value, 'MT');
+        }
             $this->amounts[$key] = $newvalue;
             $totalamount += $newvalue;
         }
         $totalamount = price2num($totalamount);
 
         // Check parameters
-        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+        if ($totalamount == 0) {
+        	return -1;
+        }
+        // On accepte les montants negatifs pour les rejets de prelevement mais pas null
 
 
 		$this->db->begin();
@@ -194,7 +218,9 @@ 
 							if ($remaintopay == 0)
 							{
 								$result = $contrib->set_paid($user);
-							} else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
+							} else {
+								dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
+							}
 						}
 					}
 				}
@@ -204,7 +230,9 @@ 
 		}
 
 		$result = $this->call_trigger('PAYMENTSOCIALCONTRIBUTION_CREATE', $user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
 		if ($totalamount != 0 && !$error)
 		{
@@ -302,15 +330,34 @@ 
 
 		// Clean parameters
 
-		if (isset($this->fk_charge)) $this->fk_charge = (int) $this->fk_charge;
-		if (isset($this->amount)) $this->amount = trim($this->amount);
-		if (isset($this->fk_typepaiement)) $this->fk_typepaiement = (int) $this->fk_typepaiement;
-		if (isset($this->num_paiement)) $this->num_paiement = trim($this->num_paiement); // deprecated
-		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-		if (isset($this->note)) $this->note = trim($this->note);
-		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_charge)) {
+			$this->fk_charge = (int) $this->fk_charge;
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepaiement)) {
+			$this->fk_typepaiement = (int) $this->fk_typepaiement;
+		}
+		if (isset($this->num_paiement)) {
+			$this->num_paiement = trim($this->num_paiement);
+		}
+		// deprecated
+		if (isset($this->num_payment)) {
+			$this->num_payment = trim($this->num_payment);
+		}
+		if (isset($this->note)) {
+			$this->note = trim($this->note);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
 
 
@@ -516,7 +563,9 @@ 
             $acc->fetch($accountid);
 
             $total = $this->total;
-            if ($mode == 'payment_sc') $total = -$total;
+            if ($mode == 'payment_sc') {
+            	$total = -$total;
+            }
 
             // Insert payment into llx_bank
             $bank_line_id = $acc->addline(
@@ -544,7 +593,9 @@ 
 
                 // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
                 $url = '';
-                if ($mode == 'payment_sc') $url = DOL_URL_ROOT.'/compta/payment_sc/card.php?id=';
+                if ($mode == 'payment_sc') {
+                	$url = DOL_URL_ROOT.'/compta/payment_sc/card.php?id=';
+                }
                 if ($url)
                 {
                     $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
@@ -564,7 +615,9 @@ 
                         $socialcontrib = new ChargeSociales($this->db);
                         $socialcontrib->fetch($key);
                         $result = $acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib != $socialcontrib->type_label) ? ' ('.$socialcontrib->lib.')' : ''), 'sc');
-                        if ($result <= 0) dol_print_error($this->db);
+                        if ($result <= 0) {
+                        	dol_print_error($this->db);
+                        }
                     }
                 }
             } else {
@@ -682,16 +735,24 @@ 
 
 		$result = '';
 
-		if (empty($this->ref)) $this->ref = $this->lib;
+		if (empty($this->ref)) {
+			$this->ref = $this->lib;
+		}
         $label = $langs->trans("Payment").': '.$this->ref;
 
         if (!empty($this->id)) {
             $link = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
             $linkend = '</a>';
 
-            if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
-            if ($withpicto && $withpicto != 2) $result .= ' ';
-            if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+            if ($withpicto) {
+            	$result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+            }
+            if ($withpicto && $withpicto != 2) {
+            	$result .= ' ';
+            }
+            if ($withpicto != 2) {
+            	$result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+            }
         }
 
         return $result;

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

Indentation +644 added lines, -644 removed lines

@@ -100,13 +100,13 @@ 
 	public $author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_valid;
 
 	public $date; // Date invoice
@@ -153,8 +153,8 @@ 
 	public $mode_reglement_code; // Code in llx_c_paiement
 
 	/**
-     * @var int ID Field to store bank id to use when payment mode is withdraw
-     */
+	 * @var int ID Field to store bank id to use when payment mode is withdraw
+	 */
 	public $fk_bank;
 
 	/**
@@ -175,8 +175,8 @@ 
 
 	// Multicurrency
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_multicurrency;
 
 	public $multicurrency_code;
@@ -323,30 +323,30 @@ 
 	);
 	// END MODULEBUILDER PROPERTIES
 
-    /**
-     * Standard invoice
-     */
-    const TYPE_STANDARD = 0;
+	/**
+	 * Standard invoice
+	 */
+	const TYPE_STANDARD = 0;
 
-    /**
-     * Replacement invoice
-     */
-    const TYPE_REPLACEMENT = 1;
+	/**
+	 * Replacement invoice
+	 */
+	const TYPE_REPLACEMENT = 1;
 
-    /**
-     * Credit note invoice
-     */
-    const TYPE_CREDIT_NOTE = 2;
+	/**
+	 * Credit note invoice
+	 */
+	const TYPE_CREDIT_NOTE = 2;
 
-    /**
-     * Deposit invoice
-     */
-    const TYPE_DEPOSIT = 3;
+	/**
+	 * Deposit invoice
+	 */
+	const TYPE_DEPOSIT = 3;
 
-    /**
-     * Proforma invoice (should not be used. a proforma is an order)
-     */
-    const TYPE_PROFORMA = 4;
+	/**
+	 * Proforma invoice (should not be used. a proforma is an order)
+	 */
+	const TYPE_PROFORMA = 4;
 
 	/**
 	 * Situation invoice
@@ -407,7 +407,7 @@ 
 	 * 	@param	int		$forceduedate	If set, do not recalculate due date from payment condition but force it with value
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function create(User $user, $notrigger = 0, $forceduedate = 0)
+	public function create(User $user, $notrigger = 0, $forceduedate = 0)
 	{
 		global $langs, $conf, $mysoc, $hookmanager;
 		$error = 0;
@@ -461,7 +461,7 @@ 
 		// Create invoice from a template invoice
 		if ($this->fac_rec > 0)
 		{
-		    $this->fk_fac_rec_source = $this->fac_rec;
+			$this->fk_fac_rec_source = $this->fac_rec;
 
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 			$_facrec = new FactureRec($this->db);
@@ -503,9 +503,9 @@ 
 			$this->ref_client = trim($this->ref_client);
 			$this->note_public = trim($this->note_public);
 			$this->note_private = trim($this->note_private);
-		    $this->note_private = dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->ref));
+			$this->note_private = dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->ref));
 
-		    $this->array_options = $_facrec->array_options;
+			$this->array_options = $_facrec->array_options;
 
 			//if (! $this->remise) $this->remise = 0;
 			if (!$this->mode_reglement_id) $this->mode_reglement_id = 0;
@@ -520,12 +520,12 @@ 
 			// For recurring invoices, update date and number of last generation of recurring template invoice, before inserting new invoice
 			if ($_facrec->frequency > 0)
 			{
-			    dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
-			    if (empty($_facrec->date_when)) $_facrec->date_when = $now;
-                $next_date = $_facrec->getNextDate(); // Calculate next date
-                $result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
-                //$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);		// Not required, +1 already included into setNextDate when second param is 1.
-                $result = $_facrec->setNextDate($next_date, 1);
+				dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
+				if (empty($_facrec->date_when)) $_facrec->date_when = $now;
+				$next_date = $_facrec->getNextDate(); // Calculate next date
+				$result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
+				//$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);		// Not required, +1 already included into setNextDate when second param is 1.
+				$result = $_facrec->setNextDate($next_date, 1);
 			}
 
 			// Define lang of customer
@@ -536,8 +536,8 @@ 
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) $newlang = $this->default_lang; // for thirdparty
 			if (!empty($newlang))
 			{
-			    $outputlangs = new Translate("", $conf);
-			    $outputlangs->setDefaultLang($newlang);
+				$outputlangs = new Translate("", $conf);
+				$outputlangs->setDefaultLang($newlang);
 			}
 
 			// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
@@ -567,16 +567,16 @@ 
 		}
 
 		// Define due date if not already defined
-        if (empty($forceduedate)) {
-            $duedate = $this->calculate_date_lim_reglement();
-            /*if ($duedate < 0) {	Regression, a date can be negative if before 1970.
+		if (empty($forceduedate)) {
+			$duedate = $this->calculate_date_lim_reglement();
+			/*if ($duedate < 0) {	Regression, a date can be negative if before 1970.
                 dol_syslog(__METHOD__ . ' Error in calculate_date_lim_reglement. We got ' . $duedate, LOG_ERR);
                 return -1;
             }*/
-            $this->date_lim_reglement = $duedate;
-        } else {
-            $this->date_lim_reglement = $forceduedate;
-        }
+			$this->date_lim_reglement = $duedate;
+		} else {
+			$this->date_lim_reglement = $forceduedate;
+		}
 
 		// Insert into database
 		$socid = $this->socid;
@@ -595,17 +595,17 @@ 
 		$sql .= ", note_private";
 		$sql .= ", note_public";
 		$sql .= ", ref_client, ref_int";
-        $sql .= ", fk_account";
+		$sql .= ", fk_account";
 		$sql .= ", module_source, pos_source, fk_fac_rec_source, fk_facture_source, fk_user_author, fk_projet";
 		$sql .= ", fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf";
 		$sql .= ", situation_cycle_ref, situation_counter, situation_final";
 		$sql .= ", fk_incoterms, location_incoterms";
-        $sql .= ", fk_multicurrency";
-        $sql .= ", multicurrency_code";
-        $sql .= ", multicurrency_tx";
-        $sql .= ", retained_warranty";
-        $sql .= ", retained_warranty_date_limit";
-        $sql .= ", retained_warranty_fk_cond_reglement";
+		$sql .= ", fk_multicurrency";
+		$sql .= ", multicurrency_code";
+		$sql .= ", multicurrency_tx";
+		$sql .= ", retained_warranty";
+		$sql .= ", retained_warranty_date_limit";
+		$sql .= ", retained_warranty_fk_cond_reglement";
 		$sql .= ")";
 		$sql .= " VALUES (";
 		$sql .= "'(PROV)'";
@@ -636,7 +636,7 @@ 
 		$sql .= ", ".($this->situation_counter ? "'".$this->db->escape($this->situation_counter)."'" : "null");
 		$sql .= ", ".($this->situation_final ? $this->situation_final : 0);
 		$sql .= ", ".(int) $this->fk_incoterms;
-        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql .= ", ".(int) $this->fk_multicurrency;
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql .= ", ".(double) $this->multicurrency_tx;
@@ -667,27 +667,27 @@ 
 			{
 				foreach ($this->linked_objects as $origin => $tmp_origin_id)
 				{
-				    if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-				    {
-				        foreach ($tmp_origin_id as $origin_id)
-				        {
-				            $ret = $this->add_object_linked($origin, $origin_id);
-				            if (!$ret)
-				            {
-				                $this->error = $this->db->lasterror();
-				                $error++;
-				            }
-				        }
-				    } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-				    {
-				        $origin_id = $tmp_origin_id;
-    					$ret = $this->add_object_linked($origin, $origin_id);
-    					if (!$ret)
-    					{
-    						$this->error = $this->db->lasterror();
-    						$error++;
-    					}
-				    }
+					if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+					{
+						foreach ($tmp_origin_id as $origin_id)
+						{
+							$ret = $this->add_object_linked($origin, $origin_id);
+							if (!$ret)
+							{
+								$this->error = $this->db->lasterror();
+								$error++;
+							}
+						}
+					} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+					{
+						$origin_id = $tmp_origin_id;
+						$ret = $this->add_object_linked($origin, $origin_id);
+						if (!$ret)
+						{
+							$this->error = $this->db->lasterror();
+							$error++;
+						}
+					}
 				}
 			}
 
@@ -698,20 +698,20 @@ 
 				$originidforcontact = $this->origin_id;
 				if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
 				{
-				    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-				    $exp = new Expedition($this->db);
-				    $exp->fetch($this->origin_id);
-				    $exp->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
-				    if (count($exp->linkedObjectsIds['commande']) > 0)
-				    {
-				        foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
-				        {
-				            $originforcontact = 'commande';
-				            if (is_object($value)) $originidforcontact = $value->id;
-				            else $originidforcontact = $value;
-				            break; // We take first one
-				        }
-				    }
+					require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+					$exp = new Expedition($this->db);
+					$exp->fetch($this->origin_id);
+					$exp->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
+					if (count($exp->linkedObjectsIds['commande']) > 0)
+					{
+						foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
+						{
+							$originforcontact = 'commande';
+							if (is_object($value)) $originidforcontact = $value->id;
+							else $originidforcontact = $value;
+							break; // We take first one
+						}
+					}
 				}
 
 				$sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
@@ -720,11 +720,11 @@ 
 				$resqlcontact = $this->db->query($sqlcontact);
 				if ($resqlcontact)
 				{
-				    while ($objcontact = $this->db->fetch_object($resqlcontact))
-				    {
-				        //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
-				        $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
-				    }
+					while ($objcontact = $this->db->fetch_object($resqlcontact))
+					{
+						//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
+						$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
+					}
 				} else dol_print_error($resqlcontact);
 			}
 
@@ -764,12 +764,12 @@ 
 						$newinvoiceline->fk_parent_line = $fk_parent_line;
 
 						if ($this->type === Facture::TYPE_REPLACEMENT && $newinvoiceline->fk_remise_except) {
-                            $discount = new DiscountAbsolute($this->db);
-                            $discount->fetch($newinvoiceline->fk_remise_except);
+							$discount = new DiscountAbsolute($this->db);
+							$discount->fetch($newinvoiceline->fk_remise_except);
 
-						    $discountId = $soc->set_remise_except($discount->amount_ht, $user, $discount->description, $discount->tva_tx);
-						    $newinvoiceline->fk_remise_except = $discountId;
-                        }
+							$discountId = $soc->set_remise_except($discount->amount_ht, $user, $discount->description, $discount->tva_tx);
+							$newinvoiceline->fk_remise_except = $discountId;
+						}
 
 						$result = $newinvoiceline->insert();
 
@@ -793,13 +793,13 @@ 
 
 				foreach ($this->lines as $i => $val)
 				{
-                	$line = $this->lines[$i];
+					$line = $this->lines[$i];
 
-                	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
-				    //if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-                	if (!is_object($line)) $line = (object) $line;
+					// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
+					//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
+					if (!is_object($line)) $line = (object) $line;
 
-				    if ($result >= 0)
+					if ($result >= 0)
 					{
 						// Reset fk_parent_line for no child products and special product
 						if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
@@ -818,7 +818,7 @@ 
 							$origintype = $this->element;
 						}
 
-                        $result = $this->addline(
+						$result = $this->addline(
 							$line->desc,
 							$line->subprice,
 							$line->qty,
@@ -837,8 +837,8 @@ 
 							$line->product_type,
 							$line->rang,
 							$line->special_code,
-	                        $origintype,
-	                        $originid,
+							$origintype,
+							$originid,
 							$fk_parent_line,
 							$line->fk_fournprice,
 							$line->pa_ht,
@@ -896,26 +896,26 @@ 
 					$buyprice = empty($_facrec->lines[$i]->buyprice) ? 0 : $_facrec->lines[$i]->buyprice;
 					// If buyprice not defined from template invoice, we try to guess the best value
 					if (!$buyprice && $_facrec->lines[$i]->fk_product > 0)
-                    {
-                        require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-                        $producttmp = new ProductFournisseur($this->db);
-                        $producttmp->fetch($_facrec->lines[$i]->fk_product);
-
-                        // If margin module defined on costprice, we try the costprice
-                        // If not defined or if module margin defined and pmp and stock module enabled, we try pmp price
-                        // else we get the best supplier price
-                        if ($conf->global->MARGIN_TYPE == 'costprice' && !empty($producttmp->cost_price)) $buyprice = $producttmp->cost_price;
-                        elseif (!empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && !empty($producttmp->pmp)) $buyprice = $producttmp->pmp;
-                        else {
-                            if ($producttmp->find_min_price_product_fournisseur($_facrec->lines[$i]->fk_product) > 0)
-                            {
-                                if ($producttmp->product_fourn_price_id > 0)
-                                {
-                                    $buyprice = price2num($producttmp->fourn_unitprice * (1 - $producttmp->fourn_remise_percent / 100) + $producttmp->fourn_remise, 'MU');
-                                }
-                            }
-                        }
-                    }
+					{
+						require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+						$producttmp = new ProductFournisseur($this->db);
+						$producttmp->fetch($_facrec->lines[$i]->fk_product);
+
+						// If margin module defined on costprice, we try the costprice
+						// If not defined or if module margin defined and pmp and stock module enabled, we try pmp price
+						// else we get the best supplier price
+						if ($conf->global->MARGIN_TYPE == 'costprice' && !empty($producttmp->cost_price)) $buyprice = $producttmp->cost_price;
+						elseif (!empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && !empty($producttmp->pmp)) $buyprice = $producttmp->pmp;
+						else {
+							if ($producttmp->find_min_price_product_fournisseur($_facrec->lines[$i]->fk_product) > 0)
+							{
+								if ($producttmp->product_fourn_price_id > 0)
+								{
+									$buyprice = price2num($producttmp->fourn_unitprice * (1 - $producttmp->fourn_remise_percent / 100) + $producttmp->fourn_remise, 'MU');
+								}
+							}
+						}
+					}
 
 					$result_insert = $this->addline(
 						$_facrec->lines[$i]->desc,
@@ -939,7 +939,7 @@ 
 						'',
 						0,
 						0,
-					    $fk_product_fournisseur_price,
+						$fk_product_fournisseur_price,
 						$buyprice,
 						$_facrec->lines[$i]->label,
 						empty($_facrec->lines[$i]->array_options) ?null:$_facrec->lines[$i]->array_options,
@@ -968,17 +968,17 @@ 
 					// Actions on extra fields
 					if (!$error)
 					{
-					    $result = $this->insertExtraFields();
-					    if ($result < 0) $error++;
+						$result = $this->insertExtraFields();
+						if ($result < 0) $error++;
 					}
 
-			        if (!$error && !$notrigger)
-			        {
-			            // Call trigger
-			            $result = $this->call_trigger('BILL_CREATE', $user);
-			            if ($result < 0) $error++;
-			            // End call triggers
-			        }
+					if (!$error && !$notrigger)
+					{
+						// Call trigger
+						$result = $this->call_trigger('BILL_CREATE', $user);
+						if ($result < 0) $error++;
+						// End call triggers
+					}
 
 					if (!$error)
 					{
@@ -1013,7 +1013,7 @@ 
 	 *	@param		int		$invertdetail	Reverse sign of amounts for lines
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-    public function createFromCurrent(User $user, $invertdetail = 0)
+	public function createFromCurrent(User $user, $invertdetail = 0)
 	{
 		global $conf;
 
@@ -1024,13 +1024,13 @@ 
 		// fetch optionals attributes and labels
 		$this->fetch_optionals();
 
-        if (!empty($this->array_options)) {
-                    $facture->array_options = $this->array_options;
-        }
+		if (!empty($this->array_options)) {
+					$facture->array_options = $this->array_options;
+		}
 
-        foreach ($this->lines as &$line) {
-                    $line->fetch_optionals(); //fetch extrafields
-        }
+		foreach ($this->lines as &$line) {
+					$line->fetch_optionals(); //fetch extrafields
+		}
 
 		$facture->fk_facture_source = $this->fk_facture_source;
 		$facture->type 			    = $this->type;
@@ -1056,9 +1056,9 @@ 
 		$facture->situation_cycle_ref = $this->situation_cycle_ref;
 		$facture->situation_final = $this->situation_final;
 
-        $facture->retained_warranty = $this->retained_warranty;
-        $facture->retained_warranty_fk_cond_reglement = $this->retained_warranty_fk_cond_reglement;
-        $facture->retained_warranty_date_limit = $this->retained_warranty_date_limit;
+		$facture->retained_warranty = $this->retained_warranty;
+		$facture->retained_warranty_fk_cond_reglement = $this->retained_warranty_fk_cond_reglement;
+		$facture->retained_warranty_date_limit = $this->retained_warranty_date_limit;
 
 
 		// Loop on each line of new invoice
@@ -1105,7 +1105,7 @@ 
 	/**
 	 *	Load an object from its id and create a new one in database
 	 *
-     *	@param      User	$user        	User that clone
+	 *	@param      User	$user        	User that clone
 	 *  @param  	int 	$fromid         Id of object to clone
 	 * 	@return		int					    New id of clone
 	 */
@@ -1128,11 +1128,11 @@ 
 
 			if ($objsoc->fetch($this->socid) > 0)
 			{
-			    $object->socid = $objsoc->id;
-			    $object->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-			    $object->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-			    $object->fk_project = '';
-			    $object->fk_delivery_address = '';
+				$object->socid = $objsoc->id;
+				$object->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+				$object->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+				$object->fk_project = '';
+				$object->fk_delivery_address = '';
 			}
 
 			// TODO Change product price if multi-prices
@@ -1161,10 +1161,10 @@ 
 		// Loop on each line of new invoice
 		foreach ($object->lines as $i => $line)
 		{
-		    if (($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
+			if (($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
 			{
-			    unset($object->lines[$i]);
-			    unset($object->products[$i]); // Tant que products encore utilise
+				unset($object->lines[$i]);
+				unset($object->products[$i]); // Tant que products encore utilise
 			}
 						// Bloc to update dates of service (month by month only if previously filled at 1d near start or end of month)
 			// If it's a service with start and end dates
@@ -1198,13 +1198,13 @@ 
 		if ($result < 0) $error++;
 		else {
 			// copy internal contacts
-		    if ($object->copy_linked_contact($this, 'internal') < 0)
+			if ($object->copy_linked_contact($this, 'internal') < 0)
 				$error++;
 
 			// copy external contacts if same company
 			elseif ($this->socid == $object->socid)
 			{
-			    if ($object->copy_linked_contact($this, 'external') < 0)
+				if ($object->copy_linked_contact($this, 'external') < 0)
 					$error++;
 			}
 		}
@@ -1241,7 +1241,7 @@ 
 	 *  @param		User			$user				Object user
 	 *  @return     int             					<0 if KO, 0 if nothing done, 1 if OK
 	 */
-    public function createFromOrder($object, User $user)
+	public function createFromOrder($object, User $user)
 	{
 		global $conf, $hookmanager;
 
@@ -1294,7 +1294,7 @@ 
 			$marginInfos			= getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht);
 			$line->pa_ht			= $marginInfos[0];
 
-            // get extrafields from original line
+			// get extrafields from original line
 			$object->lines[$i]->fetch_optionals();
 			foreach ($object->lines[$i]->array_options as $options_key => $value)
 				$line->array_options[$options_key] = $value;
@@ -1316,17 +1316,17 @@ 
 
 		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN))
 		{
-		    $this->note_private = $object->note_private;
-            $this->note_public = $object->note_public;
+			$this->note_private = $object->note_private;
+			$this->note_public = $object->note_public;
 		}
 
-        $this->module_source = $object->module_source;
+		$this->module_source = $object->module_source;
 		$this->pos_source = $object->pos_source;
 
 		$this->origin = $object->element;
 		$this->origin_id = $object->id;
 
-        // get extrafields from original line
+		// get extrafields from original line
 		$object->fetch_optionals();
 		foreach ($object->array_options as $options_key => $value)
 			$this->array_options[$options_key] = $value;
@@ -1365,13 +1365,13 @@ 
 	 *  @param  int		$max             			Maxlength of ref
 	 *  @param  int		$short           			1=Return just URL
 	 *  @param  string  $moretitle       			Add more text to title tooltip
-     *  @param	int  	$notooltip		 			1=Disable tooltip
-     *  @param  int     $addlinktonotes  			1=Add link to notes
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @param  string  $target                     Target of link ('', '_self', '_blank', '_parent', '_backoffice', ...)
+	 *  @param	int  	$notooltip		 			1=Disable tooltip
+	 *  @param  int     $addlinktonotes  			1=Add link to notes
+	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  string  $target                     Target of link ('', '_self', '_blank', '_parent', '_backoffice', ...)
 	 *  @return string 			         			String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $addlinktonotes = 0, $save_lastsearch_value = -1, $target = '')
+	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $addlinktonotes = 0, $save_lastsearch_value = -1, $target = '')
 	{
 		global $langs, $conf, $user, $mysoc;
 
@@ -1382,8 +1382,8 @@ 
 		if ($option == 'withdraw') $url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id;
 		else $url = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->id;
 
-        if (!$user->rights->facture->lire)
-            $option = 'nolink';
+		if (!$user->rights->facture->lire)
+			$option = 'nolink';
 
 		if ($option !== 'nolink')
 		{
@@ -1399,56 +1399,56 @@ 
 		if ($this->type == self::TYPE_REPLACEMENT) $picto .= 'r'; // Replacement invoice
 		if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
 		if ($this->type == self::TYPE_DEPOSIT) $picto .= 'd'; // Deposit invoice
-        $label = '';
-
-        if ($user->rights->facture->lire) {
-            $label = '<u>'.$langs->trans("Invoice").'</u>';
-            if ($this->type == self::TYPE_REPLACEMENT) $label = '<u>'.$langs->transnoentitiesnoconv("ReplacementInvoice").'</u>';
-            if ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u>'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
-            if ($this->type == self::TYPE_DEPOSIT)     $label = '<u>'.$langs->transnoentitiesnoconv("Deposit").'</u>';
-            if ($this->type == self::TYPE_SITUATION)   $label = '<u>'.$langs->transnoentitiesnoconv("InvoiceSituation").'</u>';
-            if (!empty($this->ref))
-                $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-            if (!empty($this->ref_client))
-                $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
-            if (!empty($this->date))
-              	$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
-            if (!empty($this->total_ht))
-                $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-            if (!empty($this->total_tva))
-                $label .= '<br><b>'.$langs->trans('AmountVAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-            if (!empty($this->total_localtax1) && $this->total_localtax1 != 0)		// We keep test != 0 because $this->total_localtax1 can be '0.00000000'
-            	$label .= '<br><b>'.$langs->transcountry('AmountLT1', $mysoc->country_code).':</b> '.price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
-            if (!empty($this->total_localtax2) && $this->total_localtax2 != 0)
-            	$label .= '<br><b>'.$langs->transcountry('AmountLT2', $mysoc->country_code).':</b> '.price($this->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency);
-            if (!empty($this->total_ttc))
-                $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-    		if ($moretitle) $label .= ' - '.$moretitle;
-    		if (isset($this->statut) && isset($this->alreadypaid)) {
-    			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
-    		}
-        }
+		$label = '';
+
+		if ($user->rights->facture->lire) {
+			$label = '<u>'.$langs->trans("Invoice").'</u>';
+			if ($this->type == self::TYPE_REPLACEMENT) $label = '<u>'.$langs->transnoentitiesnoconv("ReplacementInvoice").'</u>';
+			if ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u>'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
+			if ($this->type == self::TYPE_DEPOSIT)     $label = '<u>'.$langs->transnoentitiesnoconv("Deposit").'</u>';
+			if ($this->type == self::TYPE_SITUATION)   $label = '<u>'.$langs->transnoentitiesnoconv("InvoiceSituation").'</u>';
+			if (!empty($this->ref))
+				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+			if (!empty($this->ref_client))
+				$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
+			if (!empty($this->date))
+			  	$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
+			if (!empty($this->total_ht))
+				$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+			if (!empty($this->total_tva))
+				$label .= '<br><b>'.$langs->trans('AmountVAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+			if (!empty($this->total_localtax1) && $this->total_localtax1 != 0)		// We keep test != 0 because $this->total_localtax1 can be '0.00000000'
+				$label .= '<br><b>'.$langs->transcountry('AmountLT1', $mysoc->country_code).':</b> '.price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
+			if (!empty($this->total_localtax2) && $this->total_localtax2 != 0)
+				$label .= '<br><b>'.$langs->transcountry('AmountLT2', $mysoc->country_code).':</b> '.price($this->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency);
+			if (!empty($this->total_ttc))
+				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+			if ($moretitle) $label .= ' - '.$moretitle;
+			if (isset($this->statut) && isset($this->alreadypaid)) {
+				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
+			}
+		}
 
 		$linkclose = ($target ? ' target="'.$target.'"' : '');
 		if (empty($notooltip) && $user->rights->facture->lire)
 		{
-		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label = $langs->trans("Invoice");
-		        $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
-		    $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose .= ' class="classfortooltip"';
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("Invoice");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
 		}
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
-        if ($option == 'nolink') {
-            $linkstart = '';
-            $linkend = '';
-        }
+		if ($option == 'nolink') {
+			$linkstart = '';
+			$linkend = '';
+		}
 
 		$result .= $linkstart;
 		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
@@ -1457,19 +1457,19 @@ 
 
 		if ($addlinktonotes)
 		{
-		    $txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
-		    if ($txttoshow)
-		    {
-                //$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
-		    	$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.$txttoshow;
-    		    $result .= ' <span class="note inline-block">';
-    		    $result .= '<a href="'.DOL_URL_ROOT.'/compta/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow, 1, 1).'">';
-    		    $result .= img_picto('', 'note');
-    		    $result .= '</a>';
-    		    //$result.=img_picto($langs->trans("ViewNote"),'object_generic');
-    		    //$result.='</a>';
-    		    $result .= '</span>';
-		    }
+			$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
+			if ($txttoshow)
+			{
+				//$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
+				$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.$txttoshow;
+				$result .= ' <span class="note inline-block">';
+				$result .= '<a href="'.DOL_URL_ROOT.'/compta/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow, 1, 1).'">';
+				$result .= img_picto('', 'note');
+				$result .= '</a>';
+				//$result.=img_picto($langs->trans("ViewNote"),'object_generic');
+				//$result.='</a>';
+				$result .= '</span>';
+			}
 		}
 
 		return $result;
@@ -1507,10 +1507,10 @@ 
 		$sql .= ", f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc";
 		$sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql .= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
-        $sql .= ', f.fk_incoterms, f.location_incoterms';
-        $sql .= ', f.module_source, f.pos_source';
-        $sql .= ", i.libelle as label_incoterms";
-        $sql .= ", f.retained_warranty as retained_warranty, f.retained_warranty_date_limit as retained_warranty_date_limit, f.retained_warranty_fk_cond_reglement as retained_warranty_fk_cond_reglement";
+		$sql .= ', f.fk_incoterms, f.location_incoterms';
+		$sql .= ', f.module_source, f.pos_source';
+		$sql .= ", i.libelle as label_incoterms";
+		$sql .= ", f.retained_warranty as retained_warranty, f.retained_warranty_date_limit as retained_warranty_date_limit, f.retained_warranty_fk_cond_reglement as retained_warranty_fk_cond_reglement";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
@@ -1641,7 +1641,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load all detailed lines into this->lines
 	 *
@@ -1653,7 +1653,7 @@ 
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
 	{
 		global $langs, $conf;
-        // phpcs:enable
+		// phpcs:enable
 		$this->lines = array();
 
 		$sql = 'SELECT l.rowid, l.fk_facture, l.fk_product, l.fk_parent_line, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx,';
@@ -1697,7 +1697,7 @@ 
 				$line->qty              = $objp->qty;
 				$line->subprice         = $objp->subprice;
 
-                $line->vat_src_code = $objp->vat_src_code;
+				$line->vat_src_code = $objp->vat_src_code;
 				$line->tva_tx           = $objp->tva_tx;
 				$line->localtax1_tx     = $objp->localtax1_tx;
 				$line->localtax2_tx     = $objp->localtax2_tx;
@@ -1740,14 +1740,14 @@ 
 				$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
 				$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
 
-                $line->fetch_optionals();
+				$line->fetch_optionals();
 
 				// multilangs
-        		if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
-        		    $line = new Product($this->db);
-        		    $line->fetch($objp->fk_product);
-        		    $line->getMultiLangs();
-        		}
+				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
+					$line = new Product($this->db);
+					$line->fetch($objp->fk_product);
+					$line->getMultiLangs();
+				}
 
 				$this->lines[$i] = $line;
 
@@ -1767,7 +1767,7 @@ 
 	 *
 	 * @return	void
 	 */
-    public function fetchPreviousNextSituationInvoice()
+	public function fetchPreviousNextSituationInvoice()
 	{
 		global $conf;
 
@@ -1789,13 +1789,13 @@ 
 				$invoice = new Facture($this->db);
 				if ($invoice->fetch($objp->rowid) > 0)
 				{
-				    if ($objp->situation_counter < $this->situation_counter
-				        || ($objp->situation_counter == $this->situation_counter && $objp->rowid < $this->id) // This case appear when there are credit notes
-				       )
+					if ($objp->situation_counter < $this->situation_counter
+						|| ($objp->situation_counter == $this->situation_counter && $objp->rowid < $this->id) // This case appear when there are credit notes
+					   )
 					{
-					    $this->tab_previous_situation_invoice[] = $invoice;
+						$this->tab_previous_situation_invoice[] = $invoice;
 					} else {
-					    $this->tab_next_situation_invoice[] = $invoice;
+						$this->tab_next_situation_invoice[] = $invoice;
 					}
 				}
 			}
@@ -1809,7 +1809,7 @@ 
 	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *      @return     int      			   	<0 if KO, >0 if OK
 	 */
-    public function update(User $user, $notrigger = 0)
+	public function update(User $user, $notrigger = 0)
 	{
 		global $conf;
 
@@ -1917,16 +1917,16 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount)
 	 *
 	 *    @param     int	$idremise	Id of absolute discount
 	 *    @return    int          		>0 if OK, <0 if KO
 	 */
-    public function insert_discount($idremise)
+	public function insert_discount($idremise)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -1962,12 +1962,12 @@ 
 			// Get buy/cost price of invoice that is source of discount
 			if ($remise->fk_facture_source > 0)
 			{
-    			$srcinvoice = new Facture($this->db);
-    			$srcinvoice->fetch($remise->fk_facture_source);
-    			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php'; // TODO Move this into commonobject
-    			$formmargin = new FormMargin($this->db);
-    			$arraytmp = $formmargin->getMarginInfosArray($srcinvoice, false);
-        		$facligne->pa_ht = $arraytmp['pa_total'];
+				$srcinvoice = new Facture($this->db);
+				$srcinvoice->fetch($remise->fk_facture_source);
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php'; // TODO Move this into commonobject
+				$formmargin = new FormMargin($this->db);
+				$arraytmp = $formmargin->getMarginInfosArray($srcinvoice, false);
+				$facligne->pa_ht = $arraytmp['pa_total'];
 			}
 
 			$facligne->total_ht  = -$remise->amount_ht;
@@ -2012,7 +2012,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set customer ref
 	 *
@@ -2020,10 +2020,10 @@ 
 	 *  @param     	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-    public function set_ref_client($ref_client, $notrigger = 0)
+	public function set_ref_client($ref_client, $notrigger = 0)
 	{
-        // phpcs:enable
-	    global $user;
+		// phpcs:enable
+		global $user;
 
 		$error = 0;
 
@@ -2081,7 +2081,7 @@ 
 	 *	@param		int		$idwarehouse	Id warehouse to use for stock change.
 	 *	@return		int						<0 if KO, 0=Refused, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0, $idwarehouse = -1)
+	public function delete($user, $notrigger = 0, $idwarehouse = -1)
 	{
 		global $langs, $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -2101,10 +2101,10 @@ 
 
 		if (!$error && !$notrigger)
 		{
-            // Call trigger
-            $result = $this->call_trigger('BILL_DELETE', $user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('BILL_DELETE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 
 		// Removed extrafields
@@ -2176,7 +2176,7 @@ 
 				}
 			}
 
-            // Invoice line extrafileds
+			// Invoice line extrafileds
 			$main = MAIN_DB_PREFIX.'facturedet';
 			$ef = $main."_extrafields";
 			$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_facture = $rowid)";
@@ -2242,7 +2242,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag the invoice as paid completely (if close_code is filled) => this->fk_statut=2, this->paye=1
 	 *  or partialy (if close_code filled) + appel trigger BILL_PAYED => this->fk_statut=2, this->paye stay 0
@@ -2252,9 +2252,9 @@ 
 	 *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet (cas escompte par exemple)
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-    public function set_paid($user, $close_code = '', $close_note = '')
+	public function set_paid($user, $close_code = '', $close_note = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$error = 0;
 
 		if ($this->paye != 1)
@@ -2277,10 +2277,10 @@ 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-	            // Call trigger
-	            $result = $this->call_trigger('BILL_PAYED', $user);
-	            if ($result < 0) $error++;
-	            // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('BILL_PAYED', $user);
+				if ($result < 0) $error++;
+				// End call triggers
 			} else {
 				$error++;
 				$this->error = $this->db->lasterror();
@@ -2300,7 +2300,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
 	 *	Fonction utilisee quand un paiement prelevement est refuse,
@@ -2309,9 +2309,9 @@ 
 	 *  @param	User	$user       Object user that change status
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-    public function set_unpaid($user)
+	public function set_unpaid($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$error = 0;
 
 		$this->db->begin();
@@ -2326,10 +2326,10 @@ 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-            // Call trigger
-            $result = $this->call_trigger('BILL_UNPAYED', $user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('BILL_UNPAYED', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 		} else {
 			$error++;
 			$this->error = $this->db->error();
@@ -2347,7 +2347,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Tag invoice as canceled, with no payment on it (example for replacement invoice or payment never received) + call trigger BILL_CANCEL
 	 *	Warning, if option to decrease stock on invoice was set, this function does not change stock (it might be a cancel because
@@ -2358,9 +2358,9 @@ 
 	 *	@param	string	$close_note		Comment
 	 *	@return int         			<0 if KO, >0 if OK
 	 */
-    public function set_canceled($user, $close_code = '', $close_note = '')
+	public function set_canceled($user, $close_code = '', $close_note = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 
 		dol_syslog(get_class($this)."::set_canceled rowid=".$this->id, LOG_DEBUG);
 
@@ -2384,14 +2384,14 @@ 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-	            // Call trigger
-	            $result = $this->call_trigger('BILL_CANCEL', $user);
-	            if ($result < 0)
-	            {
+				// Call trigger
+				$result = $this->call_trigger('BILL_CANCEL', $user);
+				if ($result < 0)
+				{
 					$this->db->rollback();
 					return -1;
 				}
-	            // End call triggers
+				// End call triggers
 
 				$this->db->commit();
 				return 1;
@@ -2417,9 +2417,9 @@ 
 	 * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 * @param	int		$batch_rule		0=do not decrement batch, else batch rule to use
 	 *                                 	1=take in batches ordered by sellby and eatby dates
-     * @return	int						<0 if KO, 0=Nothing done because invoice is not a draft, >0 if OK
+	 * @return	int						<0 if KO, 0=Nothing done because invoice is not a draft, >0 if OK
 	 */
-    public function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0, $batch_rule = 0)
+	public function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0, $batch_rule = 0)
 	{
 		global $conf, $langs;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -2450,12 +2450,12 @@ 
 		}
 		if (count($this->lines) <= 0)
 		{
-        	$langs->load("errors");
+			$langs->load("errors");
 			$this->error = $langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
 			return -1;
 		}
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate)))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate)))
 		{
 			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.$conf->global->MAIN_USE_ADVANCED_PERMS, LOG_ERR);
@@ -2667,10 +2667,10 @@ 
 			// Trigger calls
 			if (!$error && !$notrigger)
 			{
-	            // Call trigger
-	            $result = $this->call_trigger('BILL_VALIDATE', $user);
-	            if ($result < 0) $error++;
-	            // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('BILL_VALIDATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
 			}
 
 			if (!$error)
@@ -2698,16 +2698,16 @@ 
 						if (@rename($dirsource, $dirdest))
 						{
 							dol_syslog("Rename ok");
-	                        // Rename docs starting with $oldref with $newref
-	                        $listoffiles = dol_dir_list($conf->facture->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-	                        foreach ($listoffiles as $fileentry)
-	                        {
-	                        	$dirsource = $fileentry['name'];
-	                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-	                        	$dirsource = $fileentry['path'].'/'.$dirsource;
-	                        	$dirdest = $fileentry['path'].'/'.$dirdest;
-	                        	@rename($dirsource, $dirdest);
-	                        }
+							// Rename docs starting with $oldref with $newref
+							$listoffiles = dol_dir_list($conf->facture->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+							foreach ($listoffiles as $fileentry)
+							{
+								$dirsource = $fileentry['name'];
+								$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+								$dirsource = $fileentry['path'].'/'.$dirsource;
+								$dirdest = $fileentry['path'].'/'.$dirdest;
+								@rename($dirsource, $dirdest);
+							}
 						}
 					}
 				}
@@ -2731,20 +2731,20 @@ 
 				$this->date_validation = $now;
 				$i = 0;
 
-                if (!empty($conf->global->INVOICE_USE_SITUATION))
-                {
-                	$final = true;
-    				$nboflines = count($this->lines);
-    				while (($i < $nboflines) && $final) {
-    					$final = ($this->lines[$i]->situation_percent == 100);
-    					$i++;
-    				}
+				if (!empty($conf->global->INVOICE_USE_SITUATION))
+				{
+					$final = true;
+					$nboflines = count($this->lines);
+					while (($i < $nboflines) && $final) {
+						$final = ($this->lines[$i]->situation_percent == 100);
+						$i++;
+					}
 
-    				if (empty($final)) $this->situation_final = 0;
-    				else $this->situation_final = 1;
+					if (empty($final)) $this->situation_final = 0;
+					else $this->situation_final = 1;
 
-				    $this->setFinal($user);
-                }
+					$this->setFinal($user);
+				}
 			}
 		} else {
 			$error++;
@@ -2766,7 +2766,7 @@ 
 	 * @param	Translate	$langs	Translate object
 	 * @return bool		false if KO, true if OK
 	 */
-    public function updatePriceNextInvoice(&$langs)
+	public function updatePriceNextInvoice(&$langs)
 	{
 		foreach ($this->tab_next_situation_invoice as $next_invoice)
 		{
@@ -2810,7 +2810,7 @@ 
 	 */
 	public function setDraft($user, $idwarehouse = -1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$error = 0;
@@ -2931,37 +2931,37 @@ 
 	 *  @param		double		$pu_ht_devise		Unit price in currency
 	 *  @return    	int             				<0 if KO, Id of line if OK
 	 */
-    public function addline(
-        $desc,
-        $pu_ht,
-        $qty,
-        $txtva,
-        $txlocaltax1 = 0,
-        $txlocaltax2 = 0,
-        $fk_product = 0,
-        $remise_percent = 0,
-        $date_start = '',
-        $date_end = '',
-        $ventil = 0,
-        $info_bits = 0,
-        $fk_remise_except = '',
-        $price_base_type = 'HT',
-        $pu_ttc = 0,
-        $type = self::TYPE_STANDARD,
-        $rang = -1,
-        $special_code = 0,
-        $origin = '',
-        $origin_id = 0,
-        $fk_parent_line = 0,
-        $fk_fournprice = null,
-        $pa_ht = 0,
-        $label = '',
-        $array_options = 0,
-        $situation_percent = 100,
-        $fk_prev_id = 0,
-        $fk_unit = null,
-        $pu_ht_devise = 0
-    ) {
+	public function addline(
+		$desc,
+		$pu_ht,
+		$qty,
+		$txtva,
+		$txlocaltax1 = 0,
+		$txlocaltax2 = 0,
+		$fk_product = 0,
+		$remise_percent = 0,
+		$date_start = '',
+		$date_end = '',
+		$ventil = 0,
+		$info_bits = 0,
+		$fk_remise_except = '',
+		$price_base_type = 'HT',
+		$pu_ttc = 0,
+		$type = self::TYPE_STANDARD,
+		$rang = -1,
+		$special_code = 0,
+		$origin = '',
+		$origin_id = 0,
+		$fk_parent_line = 0,
+		$fk_fournprice = null,
+		$pa_ht = 0,
+		$label = '',
+		$array_options = 0,
+		$situation_percent = 100,
+		$fk_prev_id = 0,
+		$fk_unit = null,
+		$pu_ht_devise = 0
+	) {
 		// Deprecation warning
 		if ($label) {
 			dol_syslog(__METHOD__.": using line label is deprecated", LOG_WARNING);
@@ -3027,8 +3027,8 @@ 
 				$product_type = $product->type;
 
 				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
-                    $langs->load("errors");
-				    $this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
+					$langs->load("errors");
+					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -3061,8 +3061,8 @@ 
 
 			// MultiCurrency
 			$multicurrency_total_ht = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
 			// Rank to use
@@ -3125,8 +3125,8 @@ 
 			$this->line->multicurrency_code = $this->multicurrency_code;
 			$this->line->multicurrency_subprice		= $pu_ht_devise;
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				$this->line->array_options = $array_options;
@@ -3183,14 +3183,14 @@ 
 	 * 	@param		int			$pa_ht				Price (without tax) of product when it was bought
 	 * 	@param		string		$label				Label of the line (deprecated, do not use)
 	 * 	@param		int			$special_code		Special code (also used by externals modules!)
-     *  @param		array		$array_options		extrafields array
+	 *  @param		array		$array_options		extrafields array
 	 * 	@param      int         $situation_percent  Situation advance percentage
 	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
 	 * 	@param		int			$notrigger			disable line update trigger
 	 *  @return    	int             				< 0 if KO, > 0 if OK
 	 */
-    public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = self::TYPE_STANDARD, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 100, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
+	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = self::TYPE_STANDARD, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 100, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
 	{
 		global $conf, $user;
 		// Deprecation warning
@@ -3232,7 +3232,7 @@ 
 			$remise_percent = price2num($remise_percent);
 			$qty			= price2num($qty);
 			$pu 			= price2num($pu);
-        	$pu_ht_devise = price2num($pu_ht_devise);
+			$pu_ht_devise = price2num($pu_ht_devise);
 			$pa_ht			= price2num($pa_ht);
 			$txtva			= price2num($txtva);
 			$txlocaltax1	= price2num($txlocaltax1);
@@ -3248,12 +3248,12 @@ 
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
 			// Clean vat code
-    		$vat_src_code = '';
-    		if (preg_match('/\((.*)\)/', $txtva, $reg))
-    		{
-    		    $vat_src_code = $reg[1];
-    		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
-    		}
+			$vat_src_code = '';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+			}
 
 			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, $situation_percent, $this->multicurrency_tx, $pu_ht_devise);
 
@@ -3268,8 +3268,8 @@ 
 
 			// MultiCurrency
 			$multicurrency_total_ht = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
 			// Old properties: $price, $remise (deprecated)
@@ -3294,8 +3294,8 @@ 
 				$product_type = $product->type;
 
 				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
-                    $langs->load("errors");
-				    $this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
+					$langs->load("errors");
+					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -3305,7 +3305,7 @@ 
 
 			$line->oldline = $staticline;
 			$this->line = $line;
-            $this->line->context = $this->context;
+			$this->line->context = $this->context;
 
 			// Reorder if fk_parent_line change
 			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
@@ -3350,8 +3350,8 @@ 
 			// Multicurrency
 			$this->line->multicurrency_subprice		= $pu_ht_devise;
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				// We replace values in this->line->array_options only for entries defined into $array_options
@@ -3371,7 +3371,7 @@ 
 				$this->db->commit();
 				return $result;
 			} else {
-			    $this->error = $this->line->error;
+				$this->error = $this->line->error;
 				$this->db->rollback();
 				return -1;
 			}
@@ -3388,7 +3388,7 @@ 
 	 * @param	float	$situation_percent	progress percentage need to be test
 	 * @return false if KO, true if OK
 	 */
-    public function checkProgressLine($idline, $situation_percent)
+	public function checkProgressLine($idline, $situation_percent)
 	{
 		$sql = 'SELECT fd.situation_percent FROM '.MAIN_DB_PREFIX.'facturedet fd
 				INNER JOIN '.MAIN_DB_PREFIX.'facture f ON (fd.fk_facture = f.rowid)
@@ -3408,7 +3408,7 @@ 
 		else return $situation_percent < $obj->situation_percent;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Update invoice line with percentage
 	 *
@@ -3416,16 +3416,16 @@ 
 	 * @param  int          $percent    Percentage
 	 * @return void
 	 */
-    public function update_percent($line, $percent)
+	public function update_percent($line, $percent)
 	{
-        // phpcs:enable
-	    global $mysoc, $user;
+		// phpcs:enable
+		global $mysoc, $user;
 
-	    // Progress should never be changed for discount lines
-	    if (($line->info_bits & 2) == 2)
-	    {
-	    	return;
-	    }
+		// Progress should never be changed for discount lines
+		if (($line->info_bits & 2) == 2)
+		{
+			return;
+		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
@@ -3451,9 +3451,9 @@ 
 	 *	@param		int		$rowid		Id of line to delete
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-    public function deleteline($rowid)
+	public function deleteline($rowid)
 	{
-        global $user;
+		global $user;
 
 		dol_syslog(get_class($this)."::deleteline rowid=".$rowid, LOG_DEBUG);
 
@@ -3481,7 +3481,7 @@ 
 
 		$line = new FactureLigne($this->db);
 
-        $line->context = $this->context;
+		$line->context = $this->context;
 
 		// For triggers
 		$result = $line->fetch($rowid);
@@ -3507,7 +3507,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set percent discount
 	 *
@@ -3516,9 +3516,9 @@ 
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 		<0 if ko, >0 if ok
 	 */
-    public function set_remise($user, $remise, $notrigger = 0)
+	public function set_remise($user, $remise, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Clean parameters
 		if (empty($remise)) $remise = 0;
 
@@ -3571,7 +3571,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set absolute discount
 	 *
@@ -3580,9 +3580,9 @@ 
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 				<0 if KO, >0 if OK
 	 */
-    public function set_remise_absolue($user, $remise, $notrigger = 0)
+	public function set_remise_absolue($user, $remise, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (empty($remise)) $remise = 0;
 
 		if ($user->rights->facture->creer)
@@ -3645,7 +3645,7 @@ 
 	 *      @param     string		$mode		'next' for next value or 'last' for last value
 	 *      @return    string					free ref or last ref
 	 */
-    public function getNextNumRef($soc, $mode = 'next')
+	public function getNextNumRef($soc, $mode = 'next')
 	{
 		global $conf, $langs;
 
@@ -3743,7 +3743,7 @@ 
 	 *	@param  int		$id		Id of object to load
 	 *	@return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 		$sql = 'SELECT c.rowid, datec, date_valid as datev, tms as datem,';
 		$sql .= ' date_closing as dateclosing,';
@@ -3789,7 +3789,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of invoices (eventually filtered on a user) into an array
 	 *
@@ -3803,9 +3803,9 @@ 
 	 *  @param    	string	$sortorder		Sort order
 	 *  @return     array|int             	-1 if KO, array with result if OK
 	 */
-    public function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'f.datef,f.rowid', $sortorder = 'DESC')
+	public function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'f.datef,f.rowid', $sortorder = 'DESC')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 
 		$ga = array();
@@ -3860,7 +3860,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of invoices qualified to be replaced by another invoice.
 	 *	Invoices matching the following rules are returned:
@@ -3869,9 +3869,9 @@ 
 	 *	@param		int		$socid		Id thirdparty
 	 *	@return    	array|int			Array of invoices ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
 	 */
-    public function list_replacable_invoices($socid = 0)
+	public function list_replacable_invoices($socid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$return = array();
@@ -3908,7 +3908,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of invoices qualified to be corrected by a credit note.
 	 *	Invoices matching the following rules are returned:
@@ -3917,9 +3917,9 @@ 
 	 *	@param		int		$socid		Id thirdparty
 	 *	@return    	array				Array of invoices ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
 	 */
-    public function list_qualified_avoir_invoices($socid = 0)
+	public function list_qualified_avoir_invoices($socid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$return = array();
@@ -3938,17 +3938,17 @@ 
 		$sql .= " AND f.type != ".self::TYPE_CREDIT_NOTE; // Type non 2 si facture non avoir
 
 		if (!empty($conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE)) {
-		    // Select the last situation invoice
-		    $sqlSit = 'SELECT MAX(fs.rowid)';
-		    $sqlSit .= " FROM ".MAIN_DB_PREFIX."facture as fs";
-		    $sqlSit .= " WHERE fs.entity IN (".getEntity('invoice').")";
-		    $sqlSit .= " AND fs.type = ".self::TYPE_SITUATION;
-		    $sqlSit .= " AND fs.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
-		    $sqlSit .= " GROUP BY fs.situation_cycle_ref";
-		    $sqlSit .= " ORDER BY fs.situation_counter";
-            $sql .= " AND ( f.type != ".self::TYPE_SITUATION." OR f.rowid IN (".$sqlSit.") )"; // Type non 5 si facture non avoir
+			// Select the last situation invoice
+			$sqlSit = 'SELECT MAX(fs.rowid)';
+			$sqlSit .= " FROM ".MAIN_DB_PREFIX."facture as fs";
+			$sqlSit .= " WHERE fs.entity IN (".getEntity('invoice').")";
+			$sqlSit .= " AND fs.type = ".self::TYPE_SITUATION;
+			$sqlSit .= " AND fs.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
+			$sqlSit .= " GROUP BY fs.situation_cycle_ref";
+			$sqlSit .= " ORDER BY fs.situation_counter";
+			$sql .= " AND ( f.type != ".self::TYPE_SITUATION." OR f.rowid IN (".$sqlSit.") )"; // Type non 5 si facture non avoir
 		} else {
-		    $sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir
+			$sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir
 		}
 
 		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
@@ -3979,16 +3979,16 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 *	@param  User		$user    	Object user
 	 *	@return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
 	 */
-    public function load_board($user)
+	public function load_board($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$clause = " WHERE";
@@ -4051,7 +4051,7 @@ 
 	 *
 	 *	@return     array       Liste des id contacts facturation
 	 */
-    public function getIdBillingContact()
+	public function getIdBillingContact()
 	{
 		return $this->getIdContact('external', 'BILLING');
 	}
@@ -4061,7 +4061,7 @@ 
 	 *
 	 *	@return     array       Liste des id contacts livraison
 	 */
-    public function getIdShippingContact()
+	public function getIdShippingContact()
 	{
 		return $this->getIdContact('external', 'SHIPPING');
 	}
@@ -4075,7 +4075,7 @@ 
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
 	 *  @return	void
 	 */
-    public function initAsSpecimen($option = '')
+	public function initAsSpecimen($option = '')
 	{
 		global $conf, $langs;
 
@@ -4083,7 +4083,7 @@ 
 		$arraynow = dol_getdate($now);
 		$nownotime = dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
@@ -4228,15 +4228,15 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 *      @return         int     <0 if KO, >0 if OK
 	 */
-    public function load_state_board()
+	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 
 		$this->nb = array();
@@ -4261,7 +4261,7 @@ 
 			{
 				$this->nb["invoices"] = $obj->nb;
 			}
-            $this->db->free($resql);
+			$this->db->free($resql);
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -4275,9 +4275,9 @@ 
 	 *
 	 * 	@return int		>0 if OK, <0 if KO
 	 */
-    public function getLinesArray()
+	public function getLinesArray()
 	{
-	    return $this->fetch_lines();
+		return $this->fetch_lines();
 	}
 
 	/**
@@ -4321,7 +4321,7 @@ 
 	 *
 	 * @return int >= 1 if OK, -1 if error
 	 */
-    public function newCycle()
+	public function newCycle()
 	{
 		$sql = 'SELECT max(situation_cycle_ref) FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql .= " WHERE f.entity IN (".getEntity('invoice', 0).")";
@@ -4344,27 +4344,27 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Checks if the invoice is the first of a cycle
 	 *
 	 * @return boolean
 	 */
-    public function is_first()
+	public function is_first()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return ($this->situation_counter == 1);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Returns an array containing the previous situations as Facture objects
 	 *
 	 * @return mixed -1 if error, array of previous situations
 	 */
-    public function get_prev_sits()
+	public function get_prev_sits()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture';
@@ -4396,7 +4396,7 @@ 
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 				<0 if KO, >0 if OK
 	 */
-    public function setFinal(User $user, $notrigger = 0)
+	public function setFinal(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -4435,15 +4435,15 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Checks if the invoice is the last in its cycle
 	 *
 	 * @return bool Last of the cycle status
 	 */
-    public function is_last_in_cycle()
+	public function is_last_in_cycle()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (!empty($this->situation_cycle_ref)) {
@@ -4501,21 +4501,21 @@ 
 		$hasDelay = $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay);
 		if ($hasDelay && !empty($this->retained_warranty) && !empty($this->retained_warranty_date_limit))
 		{
-		    $totalpaye = $this->getSommePaiement();
-		    $totalpaye = floatval($totalpaye);
-		    $RetainedWarrantyAmount = $this->getRetainedWarrantyAmount();
-		    if ($totalpaye >= 0 && $RetainedWarrantyAmount >= 0)
-		    {
-		        if (($totalpaye < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay))
-		        {
-		            $hasDelay = 1;
-		        } elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay))
-		        {
-		            $hasDelay = 1;
-		        } else {
-		            $hasDelay = 0;
-		        }
-		    }
+			$totalpaye = $this->getSommePaiement();
+			$totalpaye = floatval($totalpaye);
+			$RetainedWarrantyAmount = $this->getRetainedWarrantyAmount();
+			if ($totalpaye >= 0 && $RetainedWarrantyAmount >= 0)
+			{
+				if (($totalpaye < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay))
+				{
+					$hasDelay = 1;
+				} elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay))
+				{
+					$hasDelay = 1;
+				} else {
+					$hasDelay = 0;
+				}
+			}
 		}
 
 		return $hasDelay;
@@ -4566,45 +4566,45 @@ 
 	public function getRetainedWarrantyAmount($rounding = -1)
 	{
 		global $conf;
-	    if (empty($this->retained_warranty)) {
-	        return -1;
-	    }
-
-	    $retainedWarrantyAmount = 0;
-
-	    // Billed - retained warranty
-	    if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION))
-	    {
-	        $displayWarranty = true;
-	        // Check if this situation invoice is 100% for real
-	        if (!empty($this->lines)) {
-	            foreach ($this->lines as $i => $line) {
-	                if ($line->product_type < 2 && $line->situation_percent < 100) {
-	                    $displayWarranty = false;
-	                    break;
-	            	}
-	            }
-	        }
-
-	        if ($displayWarranty && !empty($this->situation_final))
-	        {
-	            $this->fetchPreviousNextSituationInvoice();
-	            $TPreviousIncoice = $this->tab_previous_situation_invoice;
-
-	            $total2BillWT = 0;
-	            foreach ($TPreviousIncoice as &$fac) {
-	                $total2BillWT += $fac->total_ttc;
-	            }
-	            $total2BillWT += $this->total_ttc;
-
-	            $retainedWarrantyAmount = $total2BillWT * $this->retained_warranty / 100;
-	        } else {
-	            return -1;
-	        }
-	    } else {
-	        // Because one day retained warranty could be used on standard invoices
-	        $retainedWarrantyAmount = $this->total_ttc * $this->retained_warranty / 100;
-	    }
+		if (empty($this->retained_warranty)) {
+			return -1;
+		}
+
+		$retainedWarrantyAmount = 0;
+
+		// Billed - retained warranty
+		if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION))
+		{
+			$displayWarranty = true;
+			// Check if this situation invoice is 100% for real
+			if (!empty($this->lines)) {
+				foreach ($this->lines as $i => $line) {
+					if ($line->product_type < 2 && $line->situation_percent < 100) {
+						$displayWarranty = false;
+						break;
+					}
+				}
+			}
+
+			if ($displayWarranty && !empty($this->situation_final))
+			{
+				$this->fetchPreviousNextSituationInvoice();
+				$TPreviousIncoice = $this->tab_previous_situation_invoice;
+
+				$total2BillWT = 0;
+				foreach ($TPreviousIncoice as &$fac) {
+					$total2BillWT += $fac->total_ttc;
+				}
+				$total2BillWT += $this->total_ttc;
+
+				$retainedWarrantyAmount = $total2BillWT * $this->retained_warranty / 100;
+			} else {
+				return -1;
+			}
+		} else {
+			// Because one day retained warranty could be used on standard invoices
+			$retainedWarrantyAmount = $this->total_ttc * $this->retained_warranty / 100;
+		}
 
 		if ($rounding < 0) {
 			$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
@@ -4614,7 +4614,7 @@ 
 			return round($retainedWarrantyAmount, $rounding);
 		}
 
-	    return $retainedWarrantyAmount;
+		return $retainedWarrantyAmount;
 	}
 
 	/**
@@ -4625,28 +4625,28 @@ 
 	 */
 	public function setRetainedWarranty($value)
 	{
-	    dol_syslog(get_class($this).'::setRetainedWarranty('.$value.')');
-	    if ($this->statut >= 0)
-	    {
-	        $fieldname = 'retained_warranty';
-	        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-	        $sql .= ' SET '.$fieldname.' = '.floatval($value);
-	        $sql .= ' WHERE rowid='.$this->id;
-
-	        if ($this->db->query($sql))
-	        {
-	            $this->retained_warranty = floatval($value);
-	            return 1;
-	        } else {
-	            dol_syslog(get_class($this).'::setRetainedWarranty Erreur '.$sql.' - '.$this->db->error());
-	            $this->error = $this->db->error();
-	            return -1;
-	        }
-	    } else {
-	        dol_syslog(get_class($this).'::setRetainedWarranty, status of the object is incompatible');
-	        $this->error = 'Status of the object is incompatible '.$this->statut;
-	        return -2;
-	    }
+		dol_syslog(get_class($this).'::setRetainedWarranty('.$value.')');
+		if ($this->statut >= 0)
+		{
+			$fieldname = 'retained_warranty';
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' SET '.$fieldname.' = '.floatval($value);
+			$sql .= ' WHERE rowid='.$this->id;
+
+			if ($this->db->query($sql))
+			{
+				$this->retained_warranty = floatval($value);
+				return 1;
+			} else {
+				dol_syslog(get_class($this).'::setRetainedWarranty Erreur '.$sql.' - '.$this->db->error());
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this).'::setRetainedWarranty, status of the object is incompatible');
+			$this->error = 'Status of the object is incompatible '.$this->statut;
+			return -2;
+		}
 	}
 
 
@@ -4659,33 +4659,33 @@ 
 	 */
 	public function setRetainedWarrantyDateLimit($timestamp, $dateYmd = false)
 	{
-	    if (!$timestamp && $dateYmd) {
-	        $timestamp = $this->db->jdate($dateYmd);
-	    }
-
-
-	    dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit('.$timestamp.')');
-	    if ($this->statut >= 0)
-	    {
-	        $fieldname = 'retained_warranty_date_limit';
-	        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-	        $sql .= ' SET '.$fieldname.' = '.(strval($timestamp) != '' ? '\''.$this->db->idate($timestamp).'\'' : 'null');
-	        $sql .= ' WHERE rowid='.$this->id;
-
-	        if ($this->db->query($sql))
-	        {
-	            $this->retained_warranty_date_limit = $timestamp;
-	            return 1;
-	        } else {
-	            dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit Erreur '.$sql.' - '.$this->db->error());
-	            $this->error = $this->db->error();
-	            return -1;
-	        }
-	    } else {
-	        dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit, status of the object is incompatible');
-	        $this->error = 'Status of the object is incompatible '.$this->statut;
-	        return -2;
-	    }
+		if (!$timestamp && $dateYmd) {
+			$timestamp = $this->db->jdate($dateYmd);
+		}
+
+
+		dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit('.$timestamp.')');
+		if ($this->statut >= 0)
+		{
+			$fieldname = 'retained_warranty_date_limit';
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' SET '.$fieldname.' = '.(strval($timestamp) != '' ? '\''.$this->db->idate($timestamp).'\'' : 'null');
+			$sql .= ' WHERE rowid='.$this->id;
+
+			if ($this->db->query($sql))
+			{
+				$this->retained_warranty_date_limit = $timestamp;
+				return 1;
+			} else {
+				dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit Erreur '.$sql.' - '.$this->db->error());
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit, status of the object is incompatible');
+			$this->error = 'Status of the object is incompatible '.$this->statut;
+			return -2;
+		}
 	}
 }
 
@@ -4695,12 +4695,12 @@ 
  */
 class FactureLigne extends CommonInvoiceLine
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'facturedet';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'facturedet';
@@ -4785,7 +4785,7 @@ 
 	 *	@param	int		$rowid      id of invoice line to get
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function fetch($rowid)
+	public function fetch($rowid)
 	{
 		$sql = 'SELECT fd.rowid, fd.fk_facture, fd.fk_parent_line, fd.fk_product, fd.product_type, fd.label as custom_label, fd.description, fd.price, fd.qty, fd.vat_src_code, fd.tva_tx,';
 		$sql .= ' fd.localtax1_tx, fd. localtax2_tx, fd.remise, fd.remise_percent, fd.fk_remise_except, fd.subprice,';
@@ -4863,7 +4863,7 @@ 
 
 			return 1;
 		} else {
-		    $this->error = $this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -4875,15 +4875,15 @@ 
 	 *  @param      int     $noerrorifdiscountalreadylinked  1=Do not make error if lines is linked to a discount and discount already linked to another
 	 *	@return		int						                 <0 if KO, >0 if OK
 	 */
-    public function insert($notrigger = 0, $noerrorifdiscountalreadylinked = 0)
+	public function insert($notrigger = 0, $noerrorifdiscountalreadylinked = 0)
 	{
 		global $langs, $user, $conf;
 
 		$error = 0;
 
-        $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
 
-        dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
+		dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
 
 		// Clean parameters
 		$this->desc = trim($this->desc);
@@ -4957,7 +4957,7 @@ 
 		$sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " '".$this->db->escape($this->desc)."',";
 		$sql .= " ".price2num($this->qty).",";
-        $sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
+		$sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
 		$sql .= " ".price2num($this->tva_tx).",";
 		$sql .= " ".price2num($this->localtax1_tx).",";
 		$sql .= " ".price2num($this->localtax2_tx).",";
@@ -5001,14 +5001,14 @@ 
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
 			$this->rowid = $this->id; // For backward compatibility
 
-            if (!$error)
-            {
-            	$result = $this->insertExtraFields();
-            	if ($result < 0)
-            	{
-            		$error++;
-            	}
-            }
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
 			// Si fk_remise_except defini, on lie la remise a la facture
 			// ce qui la flague comme "consommee".
@@ -5021,16 +5021,16 @@ 
 					// Check if discount was found
 					if ($result > 0)
 					{
-					    // Check if discount not already affected to another invoice
+						// Check if discount not already affected to another invoice
 						if ($discount->fk_facture_line > 0)
 						{
-						    if (empty($noerrorifdiscountalreadylinked))
-						    {
-    							$this->error = $langs->trans("ErrorDiscountAlreadyUsed", $discount->id);
-    							dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
-    							$this->db->rollback();
-    							return -3;
-						    }
+							if (empty($noerrorifdiscountalreadylinked))
+							{
+								$this->error = $langs->trans("ErrorDiscountAlreadyUsed", $discount->id);
+								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
+								$this->db->rollback();
+								return -3;
+							}
 						} else {
 							$result = $discount->link_to_invoice($this->rowid, 0);
 							if ($result < 0)
@@ -5057,14 +5057,14 @@ 
 
 			if (!$notrigger)
 			{
-                // Call trigger
-                $result = $this->call_trigger('LINEBILL_INSERT', $user);
-                if ($result < 0)
-                {
+				// Call trigger
+				$result = $this->call_trigger('LINEBILL_INSERT', $user);
+				if ($result < 0)
+				{
 					$this->db->rollback();
 					return -2;
 				}
-                // End call triggers
+				// End call triggers
 			}
 
 			$this->db->commit();
@@ -5083,7 +5083,7 @@ 
 	 *	@param		int		$notrigger	Disable triggers
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-    public function update($user = '', $notrigger = 0)
+	public function update($user = '', $notrigger = 0)
 	{
 		global $user, $conf;
 
@@ -5129,34 +5129,34 @@ 
 
 		$this->db->begin();
 
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
-        $sql .= " description='".$this->db->escape($this->desc)."'";
-        $sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
-        $sql .= ", subprice=".price2num($this->subprice)."";
-        $sql .= ", remise_percent=".price2num($this->remise_percent)."";
-        if ($this->fk_remise_except) $sql .= ", fk_remise_except=".$this->fk_remise_except;
-        else $sql .= ", fk_remise_except=null";
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
+		$sql .= " description='".$this->db->escape($this->desc)."'";
+		$sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+		$sql .= ", subprice=".price2num($this->subprice)."";
+		$sql .= ", remise_percent=".price2num($this->remise_percent)."";
+		if ($this->fk_remise_except) $sql .= ", fk_remise_except=".$this->fk_remise_except;
+		else $sql .= ", fk_remise_except=null";
 		$sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->db->escape($this->vat_src_code))."'";
-        $sql .= ", tva_tx=".price2num($this->tva_tx)."";
-        $sql .= ", localtax1_tx=".price2num($this->localtax1_tx)."";
-        $sql .= ", localtax2_tx=".price2num($this->localtax2_tx)."";
+		$sql .= ", tva_tx=".price2num($this->tva_tx)."";
+		$sql .= ", localtax1_tx=".price2num($this->localtax1_tx)."";
+		$sql .= ", localtax2_tx=".price2num($this->localtax2_tx)."";
 		$sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
 		$sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
-        $sql .= ", qty=".price2num($this->qty);
-        $sql .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
-        $sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
-        $sql .= ", product_type=".$this->product_type;
-        $sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
-        $sql .= ", special_code='".$this->db->escape($this->special_code)."'";
-        if (empty($this->skip_update_total))
-        {
-        	$sql .= ", total_ht=".price2num($this->total_ht);
-        	$sql .= ", total_tva=".price2num($this->total_tva);
-        	$sql .= ", total_ttc=".price2num($this->total_ttc);
-        	$sql .= ", total_localtax1=".price2num($this->total_localtax1);
-        	$sql .= ", total_localtax2=".price2num($this->total_localtax2);
-        }
+		$sql .= ", qty=".price2num($this->qty);
+		$sql .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
+		$sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
+		$sql .= ", product_type=".$this->product_type;
+		$sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
+		$sql .= ", special_code='".$this->db->escape($this->special_code)."'";
+		if (empty($this->skip_update_total))
+		{
+			$sql .= ", total_ht=".price2num($this->total_ht);
+			$sql .= ", total_tva=".price2num($this->total_tva);
+			$sql .= ", total_ttc=".price2num($this->total_ttc);
+			$sql .= ", total_localtax1=".price2num($this->total_localtax1);
+			$sql .= ", total_localtax2=".price2num($this->total_localtax2);
+		}
 		$sql .= ", fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
 		$sql .= ", buy_price_ht='".price2num($this->pa_ht)."'";
 		$sql .= ", fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
@@ -5167,9 +5167,9 @@ 
 
 		// Multicurrency
 		$sql .= ", multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		$sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+		$sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+		$sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
 		$sql .= " WHERE rowid = ".$this->rowid;
 
@@ -5177,26 +5177,26 @@ 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-        	if (!$error)
-        	{
-        		$this->id = $this->rowid;
-        		$result = $this->insertExtraFields();
-        		if ($result < 0)
-        		{
-        			$error++;
-        		}
-        	}
+			if (!$error)
+			{
+				$this->id = $this->rowid;
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
 			if (!$error && !$notrigger)
 			{
-                // Call trigger
-                $result = $this->call_trigger('LINEBILL_UPDATE', $user);
-                if ($result < 0)
+				// Call trigger
+				$result = $this->call_trigger('LINEBILL_UPDATE', $user);
+				if ($result < 0)
  				{
 					$this->db->rollback();
 					return -2;
 				}
-                // End call triggers
+				// End call triggers
 			}
 			$this->db->commit();
 			return 1;
@@ -5210,10 +5210,10 @@ 
 	/**
 	 * 	Delete line in database
 	 *  TODO Add param User $user and notrigger (see skeleton)
-     *
+	 *
 	 *	@return	    int		           <0 if KO, >0 if OK
 	 */
-    public function delete()
+	public function delete()
 	{
 		global $user;
 
@@ -5228,13 +5228,13 @@ 
 		}
 		// End call triggers
 
-        // extrafields
-        $result = $this->deleteExtraFields();
-        if ($result < 0)
-        {
-            $this->db->rollback();
-            return -1;
-        }
+		// extrafields
+		$result = $this->deleteExtraFields();
+		if ($result < 0)
+		{
+			$this->db->rollback();
+			return -1;
+		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet WHERE rowid = ".$this->rowid;
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
@@ -5249,16 +5249,16 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *	Update DB line fields total_xxx
+	 *	Update DB line fields total_xxx
 	 *	Used by migration
 	 *
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-    public function update_total()
+	public function update_total()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->db->begin();
 		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
@@ -5289,7 +5289,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Returns situation_percent of the previous line.
 	 * Warning: If invoice is a replacement invoice, this->fk_prev_id is id of the replaced line.
@@ -5298,14 +5298,14 @@ 
 	 * @param  bool    $include_credit_note		Include credit note or not
 	 * @return int                     >= 0
 	 */
-    public function get_prev_progress($invoiceid, $include_credit_note = true)
+	public function get_prev_progress($invoiceid, $include_credit_note = true)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $invoicecache;
 		if (is_null($this->fk_prev_id) || empty($this->fk_prev_id) || $this->fk_prev_id == "") {
 			return 0;
 		} else {
-		    // If invoice is not a situation invoice, this->fk_prev_id is used for something else
+			// If invoice is not a situation invoice, this->fk_prev_id is used for something else
 			if (!isset($invoicecache[$invoiceid])) {
 				$invoicecache[$invoiceid] = new Facture($this->db);
 				$invoicecache[$invoiceid]->fetch($invoiceid);
@@ -5320,20 +5320,20 @@ 
 				$returnPercent = floatval($res['situation_percent']);
 
 				if ($include_credit_note) {
-				    $sql = 'SELECT fd.situation_percent FROM '.MAIN_DB_PREFIX.'facturedet fd';
-				    $sql .= ' JOIN '.MAIN_DB_PREFIX.'facture f ON (f.rowid = fd.fk_facture) ';
-				    $sql .= ' WHERE fd.fk_prev_id ='.$this->fk_prev_id;
-				    $sql .= ' AND f.situation_cycle_ref = '.$invoicecache[$invoiceid]->situation_cycle_ref; // Prevent cycle outed
-				    $sql .= ' AND f.type = '.Facture::TYPE_CREDIT_NOTE;
-
-				    $res = $this->db->query($sql);
-				    if ($res) {
-				        while ($obj = $this->db->fetch_object($res)) {
-				            $returnPercent = $returnPercent + floatval($obj->situation_percent);
-				        }
-				    } else {
-				    	dol_print_error($this->db);
-				    }
+					$sql = 'SELECT fd.situation_percent FROM '.MAIN_DB_PREFIX.'facturedet fd';
+					$sql .= ' JOIN '.MAIN_DB_PREFIX.'facture f ON (f.rowid = fd.fk_facture) ';
+					$sql .= ' WHERE fd.fk_prev_id ='.$this->fk_prev_id;
+					$sql .= ' AND f.situation_cycle_ref = '.$invoicecache[$invoiceid]->situation_cycle_ref; // Prevent cycle outed
+					$sql .= ' AND f.type = '.Facture::TYPE_CREDIT_NOTE;
+
+					$res = $this->db->query($sql);
+					if ($res) {
+						while ($obj = $this->db->fetch_object($res)) {
+							$returnPercent = $returnPercent + floatval($obj->situation_percent);
+						}
+					} else {
+						dol_print_error($this->db);
+					}
 				}
 
 				return $returnPercent;

Braces +627 added lines, -227 removed lines

@@ -45,8 +45,12 @@ 
 require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+}
 
 /**
  *	Class to manage invoices
@@ -413,18 +417,27 @@ 
 		$error = 0;
 
 		// Clean parameters
-		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
+		if (empty($this->type)) {
+			$this->type = self::TYPE_STANDARD;
+		}
 		$this->ref_client = trim($this->ref_client);
 		$this->note = (isset($this->note) ? trim($this->note) : trim($this->note_private)); // deprecated
 		$this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note_private));
 		$this->note_public = trim($this->note_public);
-		if (!$this->cond_reglement_id) $this->cond_reglement_id = 0;
-		if (!$this->mode_reglement_id) $this->mode_reglement_id = 0;
+		if (!$this->cond_reglement_id) {
+			$this->cond_reglement_id = 0;
+		}
+		if (!$this->mode_reglement_id) {
+			$this->mode_reglement_id = 0;
+		}
 		$this->brouillon = 1;
 
 		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+			list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
+		} else {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = $conf->currency;
@@ -473,10 +486,12 @@ 
 			$nextdatewhen = dol_time_plus_duree($originaldatewhen, $_facrec->frequency, $_facrec->unit_frequency);
 			$previousdaynextdatewhen = dol_time_plus_duree($nextdatewhen, -1, 'd');
 
-			if (!empty($_facrec->frequency))  // Invoice are created on same thirdparty than template when there is a recurrence, but not necessarly when there is no recurrence.
+			if (!empty($_facrec->frequency)) {
+				// Invoice are created on same thirdparty than template when there is a recurrence, but not necessarly when there is no recurrence.
 			{
 				$this->socid = $_facrec->socid;
 			}
+			}
 			$this->entity            = $_facrec->entity; // Invoice created in same entity than template
 
 			// Fields coming from GUI (priority on template). TODO Value of template should be used as default value on GUI so we can use here always value from GUI
@@ -499,7 +514,9 @@ 
 			$this->location_incoterms = $_facrec->location_incoterms;
 
 			// Clean parameters
-			if (!$this->type) $this->type = self::TYPE_STANDARD;
+			if (!$this->type) {
+				$this->type = self::TYPE_STANDARD;
+			}
 			$this->ref_client = trim($this->ref_client);
 			$this->note_public = trim($this->note_public);
 			$this->note_private = trim($this->note_private);
@@ -508,7 +525,9 @@ 
 		    $this->array_options = $_facrec->array_options;
 
 			//if (! $this->remise) $this->remise = 0;
-			if (!$this->mode_reglement_id) $this->mode_reglement_id = 0;
+			if (!$this->mode_reglement_id) {
+				$this->mode_reglement_id = 0;
+			}
 			$this->brouillon = 1;
 
 			$this->linked_objects = $_facrec->linkedObjectsIds;
@@ -521,7 +540,9 @@ 
 			if ($_facrec->frequency > 0)
 			{
 			    dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
-			    if (empty($_facrec->date_when)) $_facrec->date_when = $now;
+			    if (empty($_facrec->date_when)) {
+			    	$_facrec->date_when = $now;
+			    }
                 $next_date = $_facrec->getNextDate(); // Calculate next date
                 $result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
                 //$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);		// Not required, +1 already included into setNextDate when second param is 1.
@@ -532,8 +553,14 @@ 
 			$outputlangs = $langs;
 			$newlang = '';
 
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->thirdparty->default_lang)) $newlang = $this->thirdparty->default_lang; // for proposal, order, invoice, ...
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) $newlang = $this->default_lang; // for thirdparty
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->thirdparty->default_lang)) {
+				$newlang = $this->thirdparty->default_lang;
+			}
+			// for proposal, order, invoice, ...
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) {
+				$newlang = $this->default_lang;
+			}
+			// for thirdparty
 			if (!empty($newlang))
 			{
 			    $outputlangs = new Translate("", $conf);
@@ -655,11 +682,16 @@ 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX."facture SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql) $error++;
+			if (!$resql) {
+				$error++;
+			}
 
-			if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+			if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {
+				// To use new linkedObjectsIds instead of old linked_objects
 			{
-				$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
+				$this->linked_objects = $this->linkedObjectsIds;
+			}
+			// TODO Replace linked_objects with linkedObjectsIds
 			}
 
 			// Add object linked
@@ -667,11 +699,13 @@ 
 			{
 				foreach ($this->linked_objects as $origin => $tmp_origin_id)
 				{
-				    if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+				    if (is_array($tmp_origin_id)) {
+				    	// New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
 				    {
 				        foreach ($tmp_origin_id as $origin_id)
 				        {
 				            $ret = $this->add_object_linked($origin, $origin_id);
+				    }
 				            if (!$ret)
 				            {
 				                $this->error = $this->db->lasterror();
@@ -692,13 +726,17 @@ 
 			}
 
 			// Propagate contacts
-			if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
+			if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id)) {
+				// Get contact from origin object
 			{
 				$originforcontact = $this->origin;
+			}
 				$originidforcontact = $this->origin_id;
-				if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+				if ($originforcontact == 'shipping') {
+					// shipment and order share the same contacts. If creating from shipment we take data of order
 				{
 				    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+				}
 				    $exp = new Expedition($this->db);
 				    $exp->fetch($this->origin_id);
 				    $exp->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
@@ -707,8 +745,11 @@ 
 				        foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
 				        {
 				            $originforcontact = 'commande';
-				            if (is_object($value)) $originidforcontact = $value->id;
-				            else $originidforcontact = $value;
+				            if (is_object($value)) {
+				            	$originidforcontact = $value->id;
+				            } else {
+				            	$originidforcontact = $value;
+				            }
 				            break; // We take first one
 				        }
 				    }
@@ -725,15 +766,19 @@ 
 				        //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
 				        $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
 				    }
-				} else dol_print_error($resqlcontact);
+				} else {
+					dol_print_error($resqlcontact);
+				}
 			}
 
 			/*
 			 *  Insert lines of invoices, if not from template invoice, into database
 			 */
-			if (!$error && empty($this->fac_rec) && count($this->lines) && is_object($this->lines[0]))	// If this->lines is array of InvoiceLines (preferred mode)
+			if (!$error && empty($this->fac_rec) && count($this->lines) && is_object($this->lines[0])) {
+				// If this->lines is array of InvoiceLines (preferred mode)
 			{
 				$fk_parent_line = 0;
+			}
 
 				dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
 				foreach ($this->lines as $i => $val)
@@ -745,14 +790,18 @@ 
 					$newinvoiceline->origin_id = $this->lines[$i]->id;
 
 					// Auto set date of service ?
-					if ($this->lines[$i]->date_start_fill == 1 && $originaldatewhen)			// $originaldatewhen is defined when generating from recurring invoice only
+					if ($this->lines[$i]->date_start_fill == 1 && $originaldatewhen) {
+						// $originaldatewhen is defined when generating from recurring invoice only
 					{
 						$newinvoiceline->date_start = $originaldatewhen;
 					}
-					if ($this->lines[$i]->date_end_fill == 1 && $previousdaynextdatewhen)	// $previousdaynextdatewhen is defined when generating from recurring invoice only
+					}
+					if ($this->lines[$i]->date_end_fill == 1 && $previousdaynextdatewhen) {
+						// $previousdaynextdatewhen is defined when generating from recurring invoice only
 					{
 						$newinvoiceline->date_end = $previousdaynextdatewhen;
 					}
+					}
 
 					if ($result >= 0)
 					{
@@ -785,9 +834,11 @@ 
 						break;
 					}
 				}
-			} elseif (!$error && empty($this->fac_rec)) 		// If this->lines is an array of invoice line arrays
+			} elseif (!$error && empty($this->fac_rec)) {
+				// If this->lines is an array of invoice line arrays
 			{
 				$fk_parent_line = 0;
+			}
 
 				dol_syslog("There is ".count($this->lines)." lines that are array lines");
 
@@ -797,7 +848,9 @@ 
 
                 	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				    //if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-                	if (!is_object($line)) $line = (object) $line;
+                	if (!is_object($line)) {
+                		$line = (object) $line;
+                	}
 
 				    if ($result >= 0)
 					{
@@ -808,7 +861,9 @@ 
 
 						// Complete vat rate with code
 						$vatrate = $line->tva_tx;
-						if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$line->vat_src_code.')';
+						if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) {
+							$vatrate .= ' ('.$line->vat_src_code.')';
+						}
 
 						if (!empty($conf->global->MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION)) {
 							$originid = $line->origin_id;
@@ -888,7 +943,9 @@ 
 					*/
 					$tva_tx = $_facrec->lines[$i]->tva_tx.($_facrec->lines[$i]->vat_src_code ? '('.$_facrec->lines[$i]->vat_src_code.')' : '');
 					$tva_npr = $_facrec->lines[$i]->info_bits;
-					if (empty($tva_tx)) $tva_npr = 0;
+					if (empty($tva_tx)) {
+						$tva_npr = 0;
+					}
 					$localtax1_tx = $_facrec->lines[$i]->localtax1_tx;
 					$localtax2_tx = $_facrec->lines[$i]->localtax2_tx;
 
@@ -904,9 +961,11 @@ 
                         // If margin module defined on costprice, we try the costprice
                         // If not defined or if module margin defined and pmp and stock module enabled, we try pmp price
                         // else we get the best supplier price
-                        if ($conf->global->MARGIN_TYPE == 'costprice' && !empty($producttmp->cost_price)) $buyprice = $producttmp->cost_price;
-                        elseif (!empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && !empty($producttmp->pmp)) $buyprice = $producttmp->pmp;
-                        else {
+                        if ($conf->global->MARGIN_TYPE == 'costprice' && !empty($producttmp->cost_price)) {
+                        	$buyprice = $producttmp->cost_price;
+                        } elseif (!empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && !empty($producttmp->pmp)) {
+                        	$buyprice = $producttmp->pmp;
+                        } else {
                             if ($producttmp->find_min_price_product_fournisseur($_facrec->lines[$i]->fk_product) > 0)
                             {
                                 if ($producttmp->product_fourn_price_id > 0)
@@ -969,14 +1028,18 @@ 
 					if (!$error)
 					{
 					    $result = $this->insertExtraFields();
-					    if ($result < 0) $error++;
+					    if ($result < 0) {
+					    	$error++;
+					    }
 					}
 
 			        if (!$error && !$notrigger)
 			        {
 			            // Call trigger
 			            $result = $this->call_trigger('BILL_CREATE', $user);
-			            if ($result < 0) $error++;
+			            if ($result < 0) {
+			            	$error++;
+			            }
 			            // End call triggers
 			        }
 
@@ -1161,9 +1224,11 @@ 
 		// Loop on each line of new invoice
 		foreach ($object->lines as $i => $line)
 		{
-		    if (($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
+		    if (($object->lines[$i]->info_bits & 0x02) == 0x02) {
+		    	// We do not clone line of discounts
 			{
 			    unset($object->lines[$i]);
+		    }
 			    unset($object->products[$i]); // Tant que products encore utilise
 			}
 						// Bloc to update dates of service (month by month only if previously filled at 1d near start or end of month)
@@ -1195,17 +1260,20 @@ 
 		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
 		$result = $object->create($user);
-		if ($result < 0) $error++;
-		else {
+		if ($result < 0) {
+			$error++;
+		} else {
 			// copy internal contacts
-		    if ($object->copy_linked_contact($this, 'internal') < 0)
-				$error++;
+		    if ($object->copy_linked_contact($this, 'internal') < 0) {
+		    				$error++;
+		    }
 
 			// copy external contacts if same company
 			elseif ($this->socid == $object->socid)
 			{
-			    if ($object->copy_linked_contact($this, 'external') < 0)
-					$error++;
+			    if ($object->copy_linked_contact($this, 'external') < 0) {
+			    					$error++;
+			    }
 			}
 		}
 
@@ -1217,7 +1285,9 @@ 
 				$parameters = array('objFrom'=>$this);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 			}
 		}
 
@@ -1296,8 +1366,9 @@ 
 
             // get extrafields from original line
 			$object->lines[$i]->fetch_optionals();
-			foreach ($object->lines[$i]->array_options as $options_key => $value)
-				$line->array_options[$options_key] = $value;
+			foreach ($object->lines[$i]->array_options as $options_key => $value) {
+							$line->array_options[$options_key] = $value;
+			}
 
 			$this->lines[$i] = $line;
 		}
@@ -1328,8 +1399,9 @@ 
 
         // get extrafields from original line
 		$object->fetch_optionals();
-		foreach ($object->array_options as $options_key => $value)
-			$this->array_options[$options_key] = $value;
+		foreach ($object->array_options as $options_key => $value) {
+					$this->array_options[$options_key] = $value;
+		}
 
 		// Possibility to add external linked objects with hooks
 		$this->linked_objects[$this->origin] = $this->origin_id;
@@ -1348,13 +1420,19 @@ 
 			$parameters = array('objFrom'=>$object);
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
+			if ($reshook < 0) {
+				$error++;
+			}
 
 			if (!$error)
 			{
 				return 1;
-			} else return -1;
-		} else return -1;
+			} else {
+				return -1;
+			}
+		} else {
+			return -1;
+		}
 	}
 
 	/**
@@ -1375,55 +1453,96 @@ 
 	{
 		global $langs, $conf, $user, $mysoc;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1;
+		}
+		// Force disable tooltips
 
 		$result = '';
 
-		if ($option == 'withdraw') $url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id;
-		else $url = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->id;
+		if ($option == 'withdraw') {
+			$url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id;
+		} else {
+			$url = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->id;
+		}
 
-        if (!$user->rights->facture->lire)
-            $option = 'nolink';
+        if (!$user->rights->facture->lire) {
+                    $option = 'nolink';
+        }
 
 		if ($option !== 'nolink')
 		{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
-		if ($short) return $url;
+		if ($short) {
+			return $url;
+		}
 
 		$picto = $this->picto;
-		if ($this->type == self::TYPE_REPLACEMENT) $picto .= 'r'; // Replacement invoice
-		if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
-		if ($this->type == self::TYPE_DEPOSIT) $picto .= 'd'; // Deposit invoice
+		if ($this->type == self::TYPE_REPLACEMENT) {
+			$picto .= 'r';
+		}
+		// Replacement invoice
+		if ($this->type == self::TYPE_CREDIT_NOTE) {
+			$picto .= 'a';
+		}
+		// Credit note
+		if ($this->type == self::TYPE_DEPOSIT) {
+			$picto .= 'd';
+		}
+		// Deposit invoice
         $label = '';
 
         if ($user->rights->facture->lire) {
             $label = '<u>'.$langs->trans("Invoice").'</u>';
-            if ($this->type == self::TYPE_REPLACEMENT) $label = '<u>'.$langs->transnoentitiesnoconv("ReplacementInvoice").'</u>';
-            if ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u>'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
-            if ($this->type == self::TYPE_DEPOSIT)     $label = '<u>'.$langs->transnoentitiesnoconv("Deposit").'</u>';
-            if ($this->type == self::TYPE_SITUATION)   $label = '<u>'.$langs->transnoentitiesnoconv("InvoiceSituation").'</u>';
-            if (!empty($this->ref))
-                $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-            if (!empty($this->ref_client))
-                $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
-            if (!empty($this->date))
-              	$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
-            if (!empty($this->total_ht))
-                $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-            if (!empty($this->total_tva))
-                $label .= '<br><b>'.$langs->trans('AmountVAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-            if (!empty($this->total_localtax1) && $this->total_localtax1 != 0)		// We keep test != 0 because $this->total_localtax1 can be '0.00000000'
+            if ($this->type == self::TYPE_REPLACEMENT) {
+            	$label = '<u>'.$langs->transnoentitiesnoconv("ReplacementInvoice").'</u>';
+            }
+            if ($this->type == self::TYPE_CREDIT_NOTE) {
+            	$label = '<u>'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
+            }
+            if ($this->type == self::TYPE_DEPOSIT) {
+            	$label = '<u>'.$langs->transnoentitiesnoconv("Deposit").'</u>';
+            }
+            if ($this->type == self::TYPE_SITUATION) {
+            	$label = '<u>'.$langs->transnoentitiesnoconv("InvoiceSituation").'</u>';
+            }
+            if (!empty($this->ref)) {
+                            $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+            }
+            if (!empty($this->ref_client)) {
+                            $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
+            }
+            if (!empty($this->date)) {
+                          	$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
+            }
+            if (!empty($this->total_ht)) {
+                            $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+            }
+            if (!empty($this->total_tva)) {
+                            $label .= '<br><b>'.$langs->trans('AmountVAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+            }
+            if (!empty($this->total_localtax1) && $this->total_localtax1 != 0) {
+            	// We keep test != 0 because $this->total_localtax1 can be '0.00000000'
             	$label .= '<br><b>'.$langs->transcountry('AmountLT1', $mysoc->country_code).':</b> '.price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
-            if (!empty($this->total_localtax2) && $this->total_localtax2 != 0)
-            	$label .= '<br><b>'.$langs->transcountry('AmountLT2', $mysoc->country_code).':</b> '.price($this->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency);
-            if (!empty($this->total_ttc))
-                $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-    		if ($moretitle) $label .= ' - '.$moretitle;
+            }
+            if (!empty($this->total_localtax2) && $this->total_localtax2 != 0) {
+                        	$label .= '<br><b>'.$langs->transcountry('AmountLT2', $mysoc->country_code).':</b> '.price($this->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency);
+            }
+            if (!empty($this->total_ttc)) {
+                            $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+            }
+    		if ($moretitle) {
+    			$label .= ' - '.$moretitle;
+    		}
     		if (isset($this->statut) && isset($this->alreadypaid)) {
     			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
     		}
@@ -1451,8 +1570,12 @@ 
         }
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($max ?dol_trunc($this->ref, $max) : $this->ref);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= ($max ?dol_trunc($this->ref, $max) : $this->ref);
+		}
 		$result .= $linkend;
 
 		if ($addlinktonotes)
@@ -1489,7 +1612,9 @@ 
 	{
 		global $conf;
 
-		if (empty($rowid) && empty($ref) && empty($ref_ext)) return -1;
+		if (empty($rowid) && empty($ref) && empty($ref_ext)) {
+			return -1;
+		}
 
 		$sql = 'SELECT f.rowid,f.entity,f.ref,f.ref_client,f.ref_ext,f.ref_int,f.type,f.fk_soc';
 		$sql .= ', f.tva, f.localtax1, f.localtax2, f.total, f.total_ttc, f.revenuestamp';
@@ -1516,12 +1641,20 @@ 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON f.fk_incoterms = i.rowid';
 
-		if ($rowid) $sql .= " WHERE f.rowid=".$rowid;
-		else {
+		if ($rowid) {
+			$sql .= " WHERE f.rowid=".$rowid;
+		} else {
 			$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')'; // Dont't use entity if you use rowid
-			if ($ref)     $sql .= " AND f.ref='".$this->db->escape($ref)."'";
-			if ($ref_ext) $sql .= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
-			if ($notused) $sql .= " AND f.ref_int='".$this->db->escape($notused)."'"; // deprecated
+			if ($ref) {
+				$sql .= " AND f.ref='".$this->db->escape($ref)."'";
+			}
+			if ($ref_ext) {
+				$sql .= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
+			}
+			if ($notused) {
+				$sql .= " AND f.ref_int='".$this->db->escape($notused)."'";
+			}
+			// deprecated
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -1613,7 +1746,9 @@ 
 					$this->fetchPreviousNextSituationInvoice();
 				}
 
-				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
+				if ($this->statut == self::STATUS_DRAFT) {
+					$this->brouillon = 1;
+				}
 
 				// Retreive all extrafield
 				// fetch optionals attributes and labels
@@ -1816,18 +1951,43 @@ 
 		$error = 0;
 
 		// Clean parameters
-		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
-		if (isset($this->ref)) $this->ref = trim($this->ref);
-		if (isset($this->ref_client)) $this->ref_client = trim($this->ref_client);
-		if (isset($this->increment)) $this->increment = trim($this->increment);
-		if (isset($this->close_code)) $this->close_code = trim($this->close_code);
-		if (isset($this->close_note)) $this->close_note = trim($this->close_note);
-		if (isset($this->note) || isset($this->note_private)) $this->note = (isset($this->note) ? trim($this->note) : trim($this->note_private)); // deprecated
-		if (isset($this->note) || isset($this->note_private)) $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
-		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf = trim($this->modelpdf);
-		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
-		if (isset($this->retained_warranty)) $this->retained_warranty = floatval($this->retained_warranty);
+		if (empty($this->type)) {
+			$this->type = self::TYPE_STANDARD;
+		}
+		if (isset($this->ref)) {
+			$this->ref = trim($this->ref);
+		}
+		if (isset($this->ref_client)) {
+			$this->ref_client = trim($this->ref_client);
+		}
+		if (isset($this->increment)) {
+			$this->increment = trim($this->increment);
+		}
+		if (isset($this->close_code)) {
+			$this->close_code = trim($this->close_code);
+		}
+		if (isset($this->close_note)) {
+			$this->close_note = trim($this->close_note);
+		}
+		if (isset($this->note) || isset($this->note_private)) {
+			$this->note = (isset($this->note) ? trim($this->note) : trim($this->note_private));
+		}
+		// deprecated
+		if (isset($this->note) || isset($this->note_private)) {
+			$this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->modelpdf)) {
+			$this->modelpdf = trim($this->modelpdf);
+		}
+		if (isset($this->import_key)) {
+			$this->import_key = trim($this->import_key);
+		}
+		if (isset($this->retained_warranty)) {
+			$this->retained_warranty = floatval($this->retained_warranty);
+		}
 
 
 		// Check parameters
@@ -1896,7 +2056,9 @@ 
 		{
 			// Call trigger
 			$result = $this->call_trigger('BILL_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -1939,9 +2101,11 @@ 
 
 		if ($result > 0)
 		{
-			if ($remise->fk_facture)	// Protection against multiple submission
+			if ($remise->fk_facture) {
+				// Protection against multiple submission
 			{
 				$this->error = $langs->trans("ErrorDiscountAlreadyUsed");
+			}
 				$this->db->rollback();
 				return -5;
 			}
@@ -2030,9 +2194,11 @@ 
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
-		if (empty($ref_client))
-			$sql .= ' SET ref_client = NULL';
-		else $sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
+		if (empty($ref_client)) {
+					$sql .= ' SET ref_client = NULL';
+		} else {
+			$sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
+		}
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
@@ -2052,7 +2218,9 @@ 
 		{
 			// Call trigger
 			$result = $this->call_trigger('BILL_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -2093,7 +2261,9 @@ 
 		// Test to avoid invoice deletion (allowed if draft)
 		$result = $this->is_erasable();
 
-		if ($result <= 0) return 0;
+		if ($result <= 0) {
+			return 0;
+		}
 
 		$error = 0;
 
@@ -2103,7 +2273,9 @@ 
 		{
             // Call trigger
             $result = $this->call_trigger('BILL_DELETE', $user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
 		}
 
@@ -2121,7 +2293,9 @@ 
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		if (!$error)
@@ -2170,8 +2344,12 @@ 
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We decrease stock for product
-						if ($this->type == self::TYPE_CREDIT_NOTE) $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceDeleteDolibarr", $this->ref));
-						else $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceDeleteDolibarr", $this->ref)); // we use 0 for price, to not change the weighted average value
+						if ($this->type == self::TYPE_CREDIT_NOTE) {
+							$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceDeleteDolibarr", $this->ref));
+						} else {
+							$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceDeleteDolibarr", $this->ref));
+						}
+						// we use 0 for price, to not change the weighted average value
 					}
 				}
 			}
@@ -2200,13 +2378,17 @@ 
 					{
 						$dir = $conf->facture->dir_output."/".$ref;
 						$file = $conf->facture->dir_output."/".$ref."/".$ref.".pdf";
-						if (file_exists($file))	// We must delete all files before deleting directory
+						if (file_exists($file)) {
+							// We must delete all files before deleting directory
 						{
 							$ret = dol_delete_preview($this);
+						}
 
-							if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
+							if (!dol_delete_file($file, 0, 0, 0, $this)) {
+								// For triggers
 							{
 								$langs->load("errors");
+							}
 								$this->error = $langs->trans("ErrorFailToDeleteFile", $file);
 								$this->db->rollback();
 								return 0;
@@ -2214,9 +2396,11 @@ 
 						}
 						if (file_exists($dir))
 						{
-							if (!dol_delete_dir_recursive($dir)) // For remove dir and meta
+							if (!dol_delete_dir_recursive($dir)) {
+								// For remove dir and meta
 							{
 								$langs->load("errors");
+							}
 								$this->error = $langs->trans("ErrorFailToDeleteDir", $dir);
 								$this->db->rollback();
 								return 0;
@@ -2267,9 +2451,15 @@ 
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
 			$sql .= ' fk_statut='.self::STATUS_CLOSED;
-			if (!$close_code) $sql .= ', paye=1';
-			if ($close_code) $sql .= ", close_code='".$this->db->escape($close_code)."'";
-			if ($close_note) $sql .= ", close_note='".$this->db->escape($close_note)."'";
+			if (!$close_code) {
+				$sql .= ', paye=1';
+			}
+			if ($close_code) {
+				$sql .= ", close_code='".$this->db->escape($close_code)."'";
+			}
+			if ($close_note) {
+				$sql .= ", close_note='".$this->db->escape($close_note)."'";
+			}
 			$sql .= ', fk_user_closing = '.$user->id;
 			$sql .= ", date_closing = '".$this->db->idate($now)."'";
 			$sql .= ' WHERE rowid = '.$this->id;
@@ -2279,7 +2469,9 @@ 
 			{
 	            // Call trigger
 	            $result = $this->call_trigger('BILL_PAYED', $user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
 			} else {
 				$error++;
@@ -2328,7 +2520,9 @@ 
 		{
             // Call trigger
             $result = $this->call_trigger('BILL_UNPAYED', $user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
 		} else {
 			$error++;
@@ -2368,8 +2562,12 @@ 
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
 		$sql .= ' fk_statut='.self::STATUS_ABANDONED;
-		if ($close_code) $sql .= ", close_code='".$this->db->escape($close_code)."'";
-		if ($close_note) $sql .= ", close_note='".$this->db->escape($close_note)."'";
+		if ($close_code) {
+			$sql .= ", close_code='".$this->db->escape($close_code)."'";
+		}
+		if ($close_note) {
+			$sql .= ", close_note='".$this->db->escape($close_note)."'";
+		}
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		$resql = $this->db->query($sql);
@@ -2465,12 +2663,14 @@ 
 		$this->db->begin();
 
 		// Check parameters
-		if ($this->type == self::TYPE_REPLACEMENT)		// si facture de remplacement
+		if ($this->type == self::TYPE_REPLACEMENT) {
+			// si facture de remplacement
 		{
 			// Controle que facture source connue
 			if ($this->fk_facture_source <= 0)
 			{
 				$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InvoiceReplacement"));
+		}
 				$this->db->rollback();
 				return -10;
 			}
@@ -2509,11 +2709,13 @@ 
 		if ($force_number)
 		{
 			$num = $force_number;
-		} elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+		} elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) {
+			// empty should not happened, but when it occurs, the test save life
 		{
 			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
 			{
 				$this->date = dol_now();
+		}
 				$this->date_lim_reglement = $this->calculate_date_lim_reglement();
 			}
 			$num = $this->getNextNumRef($this->thirdparty);
@@ -2529,9 +2731,11 @@ 
 			// Validate
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
 			$sql .= " SET ref='".$num."', fk_statut = ".self::STATUS_VALIDATED.", fk_user_valid = ".($user->id > 0 ? $user->id : "null").", date_valid = '".$this->db->idate($now)."'";
-			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
+			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION)) {
+				// If option enabled, we force invoice date
 			{
 				$sql .= ", datef='".$this->db->idate($this->date)."'";
+			}
 				$sql .= ", date_lim_reglement='".$this->db->idate($this->date_lim_reglement)."'";
 			}
 			$sql .= ' WHERE rowid = '.$this->id;
@@ -2609,7 +2813,10 @@ 
 											}
 
 											foreach ($batchList as $batch) {
-												if ($batch->qty <= 0) continue; // try to decrement only batches have positive quantity first
+												if ($batch->qty <= 0) {
+													continue;
+												}
+												// try to decrement only batches have positive quantity first
 
 												// enough quantity in this batch
 												if ($batch->qty >= $product_qty_remain) {
@@ -2627,7 +2834,9 @@ 
 
 												$product_qty_remain -= $product_batch_qty;
 												// all product quantity was decremented
-												if ($product_qty_remain <= 0) break;
+												if ($product_qty_remain <= 0) {
+													break;
+												}
 											}
 
 											if (!$error && $product_qty_remain > 0) {
@@ -2669,7 +2878,9 @@ 
 			{
 	            // Call trigger
 	            $result = $this->call_trigger('BILL_VALIDATE', $user);
-	            if ($result < 0) $error++;
+	            if ($result < 0) {
+	            	$error++;
+	            }
 	            // End call triggers
 			}
 
@@ -2740,8 +2951,11 @@ 
     					$i++;
     				}
 
-    				if (empty($final)) $this->situation_final = 0;
-    				else $this->situation_final = 1;
+    				if (empty($final)) {
+    					$this->situation_final = 0;
+    				} else {
+    					$this->situation_final = 1;
+    				}
 
 				    $this->setFinal($user);
                 }
@@ -2851,8 +3065,12 @@ 
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We decrease stock for product
-						if ($this->type == self::TYPE_CREDIT_NOTE) $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
-						else $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref)); // we use 0 for price, to not change the weighted average value
+						if ($this->type == self::TYPE_CREDIT_NOTE) {
+							$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+						} else {
+							$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+						}
+						// we use 0 for price, to not change the weighted average value
 					}
 				}
 			}
@@ -2977,17 +3195,39 @@ 
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
-			if (empty($remise_percent)) $remise_percent = 0;
-			if (empty($qty)) $qty = 0;
-			if (empty($info_bits)) $info_bits = 0;
-			if (empty($rang)) $rang = 0;
-			if (empty($ventil)) $ventil = 0;
-			if (empty($txtva)) $txtva = 0;
-			if (empty($txlocaltax1)) $txlocaltax1 = 0;
-			if (empty($txlocaltax2)) $txlocaltax2 = 0;
-			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
-			if (empty($fk_prev_id)) $fk_prev_id = 'null';
-			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
+			if (empty($remise_percent)) {
+				$remise_percent = 0;
+			}
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($info_bits)) {
+				$info_bits = 0;
+			}
+			if (empty($rang)) {
+				$rang = 0;
+			}
+			if (empty($ventil)) {
+				$ventil = 0;
+			}
+			if (empty($txtva)) {
+				$txtva = 0;
+			}
+			if (empty($txlocaltax1)) {
+				$txlocaltax1 = 0;
+			}
+			if (empty($txlocaltax2)) {
+				$txlocaltax2 = 0;
+			}
+			if (empty($fk_parent_line) || $fk_parent_line < 0) {
+				$fk_parent_line = 0;
+			}
+			if (empty($fk_prev_id)) {
+				$fk_prev_id = 'null';
+			}
+			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') {
+				$situation_percent = 100;
+			}
 
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
@@ -3009,7 +3249,9 @@ 
 			}
 
 			// Check parameters
-			if ($type < 0) return -1;
+			if ($type < 0) {
+				return -1;
+			}
 
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
@@ -3136,7 +3378,9 @@ 
 			if ($result > 0)
 			{
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				// Mise a jour informations denormalisees au niveau de la facture meme
 				$result = $this->update_price(1, 'auto', 0, $mysoc); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
@@ -3210,7 +3454,9 @@ 
 			{
 				if (!$this->checkProgressLine($rowid, $situation_percent))
 				{
-					if (!$this->error) $this->error = $langs->trans('invoiceLineProgressError');
+					if (!$this->error) {
+						$this->error = $langs->trans('invoiceLineProgressError');
+					}
 					return -3;
 				}
 			}
@@ -3224,10 +3470,18 @@ 
 			$this->db->begin();
 
 			// Clean parameters
-			if (empty($qty)) $qty = 0;
-			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
-			if (empty($special_code) || $special_code == 3) $special_code = 0;
-			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($fk_parent_line) || $fk_parent_line < 0) {
+				$fk_parent_line = 0;
+			}
+			if (empty($special_code) || $special_code == 3) {
+				$special_code = 0;
+			}
+			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') {
+				$situation_percent = 100;
+			}
 
 			$remise_percent = price2num($remise_percent);
 			$qty			= price2num($qty);
@@ -3239,7 +3493,9 @@ 
 			$txlocaltax2	= price2num($txlocaltax2);
 
 			// Check parameters
-			if ($type < 0) return -1;
+			if ($type < 0) {
+				return -1;
+			}
 
 			// Calculate total with, without tax and tax from qty, pu, remise_percent and txtva
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
@@ -3364,7 +3620,9 @@ 
 			if ($result > 0)
 			{
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				// Mise a jour info denormalisees au niveau facture
 				$this->update_price(1);
@@ -3404,8 +3662,11 @@ 
 
 		$obj = $this->db->fetch_object($result);
 
-		if ($obj === null) return true;
-		else return $situation_percent < $obj->situation_percent;
+		if ($obj === null) {
+			return true;
+		} else {
+			return $situation_percent < $obj->situation_percent;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3430,7 +3691,9 @@ 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		// Cap percentages to 100
-		if ($percent > 100) $percent = 100;
+		if ($percent > 100) {
+			$percent = 100;
+		}
 		$line->situation_percent = $percent;
 		$tabprice = calcul_price_total($line->qty, $line->subprice, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 0, 'HT', 0, $line->product_type, $mysoc, '', $percent);
 		$line->total_ht = $tabprice[0];
@@ -3485,7 +3748,9 @@ 
 
 		// For triggers
 		$result = $line->fetch($rowid);
-		if (!($result > 0)) dol_print_error($this->db, $line->error, $line->errors);
+		if (!($result > 0)) {
+			dol_print_error($this->db, $line->error, $line->errors);
+		}
 
 		if ($line->delete($user) > 0)
 		{
@@ -3520,7 +3785,9 @@ 
 	{
         // phpcs:enable
 		// Clean parameters
-		if (empty($remise)) $remise = 0;
+		if (empty($remise)) {
+			$remise = 0;
+		}
 
 		if ($user->rights->facture->creer)
 		{
@@ -3547,7 +3814,9 @@ 
 			{
 				// Call trigger
 				$result = $this->call_trigger('BILL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -3583,7 +3852,9 @@ 
     public function set_remise_absolue($user, $remise, $notrigger = 0)
 	{
         // phpcs:enable
-		if (empty($remise)) $remise = 0;
+		if (empty($remise)) {
+			$remise = 0;
+		}
 
 		if ($user->rights->facture->creer)
 		{
@@ -3617,7 +3888,9 @@ 
 			{
 				// Call trigger
 				$result = $this->call_trigger('BILL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -3657,7 +3930,9 @@ 
 			$addonConstName = 'TAKEPOS_REF_ADDON';
 
 			// Clean parameters (if not defined or using deprecated value)
-			if (empty($conf->global->TAKEPOS_REF_ADDON)) $conf->global->TAKEPOS_REF_ADDON = 'mod_takepos_ref_simple';
+			if (empty($conf->global->TAKEPOS_REF_ADDON)) {
+				$conf->global->TAKEPOS_REF_ADDON = 'mod_takepos_ref_simple';
+			}
 
 			$addon = $conf->global->TAKEPOS_REF_ADDON;
 		} else {
@@ -3668,9 +3943,13 @@ 
 			$addonConstName = 'FACTURE_ADDON';
 
 			// Clean parameters (if not defined or using deprecated value)
-			if (empty($conf->global->FACTURE_ADDON)) $conf->global->FACTURE_ADDON = 'mod_facture_terre';
-			elseif ($conf->global->FACTURE_ADDON == 'terre') $conf->global->FACTURE_ADDON = 'mod_facture_terre';
-			elseif ($conf->global->FACTURE_ADDON == 'mercure') $conf->global->FACTURE_ADDON = 'mod_facture_mercure';
+			if (empty($conf->global->FACTURE_ADDON)) {
+				$conf->global->FACTURE_ADDON = 'mod_facture_terre';
+			} elseif ($conf->global->FACTURE_ADDON == 'terre') {
+				$conf->global->FACTURE_ADDON = 'mod_facture_terre';
+			} elseif ($conf->global->FACTURE_ADDON == 'mercure') {
+				$conf->global->FACTURE_ADDON = 'mod_facture_mercure';
+			}
 
 			$addon = $conf->global->FACTURE_ADDON;
 		}
@@ -3812,18 +4091,30 @@ 
 
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
 		$sql .= " f.rowid as fid, f.ref as ref, f.datef as df";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", sc.fk_soc, sc.fk_user";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
 		$sql .= " AND f.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$socid) //restriction
+		if (!$user->rights->societe->client->voir && !$socid) {
+			//restriction
 		{
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
-		if ($socid) $sql .= " AND s.rowid = ".$socid;
-		if ($draft) $sql .= " AND f.fk_statut = ".self::STATUS_DRAFT;
-		if (is_object($excluser)) $sql .= " AND f.fk_user_author <> ".$excluser->id;
+		}
+		if ($socid) {
+			$sql .= " AND s.rowid = ".$socid;
+		}
+		if ($draft) {
+			$sql .= " AND f.fk_statut = ".self::STATUS_DRAFT;
+		}
+		if (is_object($excluser)) {
+			$sql .= " AND f.fk_user_author <> ".$excluser->id;
+		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		$sql .= $this->db->plimit($limit, $offset);
 
@@ -3886,7 +4177,9 @@ 
 		$sql .= " AND f.paye = 0"; // Pas classee payee completement
 		$sql .= " AND pf.fk_paiement IS NULL"; // Aucun paiement deja fait
 		$sql .= " AND ff.fk_statut IS NULL"; // Renvoi vrai si pas facture de remplacement
-		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = ".$socid;
+		}
 		$sql .= " ORDER BY f.ref";
 
 		dol_syslog(get_class($this)."::list_replacable_invoices", LOG_DEBUG);
@@ -3951,7 +4244,9 @@ 
 		    $sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir
 		}
 
-		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = ".$socid;
+		}
 		$sql .= " ORDER BY f.ref";
 
 		dol_syslog(get_class($this)."::list_qualified_avoir_invoices", LOG_DEBUG);
@@ -3961,8 +4256,12 @@ 
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$qualified = 0;
-				if ($obj->fk_statut == self::STATUS_VALIDATED) $qualified = 1;
-				if ($obj->fk_statut == self::STATUS_CLOSED) $qualified = 1;
+				if ($obj->fk_statut == self::STATUS_VALIDATED) {
+					$qualified = 1;
+				}
+				if ($obj->fk_statut == self::STATUS_CLOSED) {
+					$qualified = 1;
+				}
 				if ($qualified)
 				{
 					//$ref=$obj->ref;
@@ -4004,7 +4303,9 @@ 
 		$sql .= $clause." f.paye=0";
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
 		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED;
-		if ($user->socid) $sql .= " AND f.fk_soc = ".$user->socid;
+		if ($user->socid) {
+			$sql .= " AND f.fk_soc = ".$user->socid;
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -4145,9 +4446,11 @@ 
 				$line->localtax1_tx = 0;
 				$line->localtax2_tx = 0;
 				$line->remise_percent = 0;
-				if ($xnbp == 1)        // Qty is negative (product line)
+				if ($xnbp == 1) {
+					// Qty is negative (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
+				}
 					$line->fk_product = $prodids[$prodid];
 					$line->qty = -1;
 					$line->total_ht = -100;
@@ -4156,9 +4459,11 @@ 
 					$line->multicurrency_total_ht = -200;
 					$line->multicurrency_total_ttc = -239.2;
 					$line->multicurrency_total_tva = -39.2;
-				} elseif ($xnbp == 2)    // UP is negative (free line)
+				} elseif ($xnbp == 2) {
+					// UP is negative (free line)
 				{
 					$line->subprice = -100;
+				}
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
 					$line->total_tva = -19.6;
@@ -4166,9 +4471,11 @@ 
 					$line->multicurrency_total_ht = -200;
 					$line->multicurrency_total_ttc = -239.2;
 					$line->multicurrency_total_tva = -39.2;
-				} elseif ($xnbp == 3)    // Discount is 50% (product line)
+				} elseif ($xnbp == 3) {
+					// Discount is 50% (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
+				}
 					$line->fk_product = $prodids[$prodid];
 					$line->total_ht = 50;
 					$line->total_ttc = 59.8;
@@ -4416,7 +4723,9 @@ 
 		{
 			// Call trigger
 			$result = $this->call_trigger('BILL_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -4496,7 +4805,9 @@ 
 		$now = dol_now();
 
 		// Paid invoices have status STATUS_CLOSED
-		if ($this->statut != Facture::STATUS_VALIDATED) return false;
+		if ($this->statut != Facture::STATUS_VALIDATED) {
+			return false;
+		}
 
 		$hasDelay = $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay);
 		if ($hasDelay && !empty($this->retained_warranty) && !empty($this->retained_warranty_date_limit))
@@ -4887,27 +5198,67 @@ 
 
 		// Clean parameters
 		$this->desc = trim($this->desc);
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->rang)) $this->rang = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->subprice)) $this->subprice = 0;
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (empty($this->fk_prev_id)) $this->fk_prev_id = 0;
-		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
-
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
-		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
-		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
-		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
-		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = 0;
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = 0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->rang)) {
+			$this->rang = 0;
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->subprice)) {
+			$this->subprice = 0;
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (empty($this->fk_prev_id)) {
+			$this->fk_prev_id = 0;
+		}
+		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') {
+			$this->situation_percent = 100;
+		}
+
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
+		if (empty($this->multicurrency_subprice)) {
+			$this->multicurrency_subprice = 0;
+		}
+		if (empty($this->multicurrency_total_ht)) {
+			$this->multicurrency_total_ht = 0;
+		}
+		if (empty($this->multicurrency_total_tva)) {
+			$this->multicurrency_total_tva = 0;
+		}
+		if (empty($this->multicurrency_total_ttc)) {
+			$this->multicurrency_total_ttc = 0;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -5093,28 +5444,66 @@ 
 
 		// Clean parameters
 		$this->desc = trim($this->desc);
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->product_type)) $this->product_type = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
-
-		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
-		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
-		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
-		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = 0;
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = 0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->product_type)) {
+			$this->product_type = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') {
+			$this->situation_percent = 100;
+		}
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
+
+		if (empty($this->multicurrency_subprice)) {
+			$this->multicurrency_subprice = 0;
+		}
+		if (empty($this->multicurrency_total_ht)) {
+			$this->multicurrency_total_ht = 0;
+		}
+		if (empty($this->multicurrency_total_tva)) {
+			$this->multicurrency_total_tva = 0;
+		}
+		if (empty($this->multicurrency_total_ttc)) {
+			$this->multicurrency_total_ttc = 0;
+		}
 
 		// Check parameters
-		if ($this->product_type < 0) return -1;
+		if ($this->product_type < 0) {
+			return -1;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -5135,8 +5524,11 @@ 
         $sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
         $sql .= ", subprice=".price2num($this->subprice)."";
         $sql .= ", remise_percent=".price2num($this->remise_percent)."";
-        if ($this->fk_remise_except) $sql .= ", fk_remise_except=".$this->fk_remise_except;
-        else $sql .= ", fk_remise_except=null";
+        if ($this->fk_remise_except) {
+        	$sql .= ", fk_remise_except=".$this->fk_remise_except;
+        } else {
+        	$sql .= ", fk_remise_except=null";
+        }
 		$sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->db->escape($this->vat_src_code))."'";
         $sql .= ", tva_tx=".price2num($this->tva_tx)."";
         $sql .= ", localtax1_tx=".price2num($this->localtax1_tx)."";
@@ -5160,7 +5552,9 @@ 
 		$sql .= ", fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
 		$sql .= ", buy_price_ht='".price2num($this->pa_ht)."'";
 		$sql .= ", fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
-		if (!empty($this->rang)) $sql .= ", rang=".$this->rang;
+		if (!empty($this->rang)) {
+			$sql .= ", rang=".$this->rang;
+		}
 		$sql .= ", situation_percent=".$this->situation_percent;
 		$sql .= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 		$sql .= ", fk_user_modif =".$user->id;
@@ -5263,8 +5657,12 @@ 
 		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
 		// Clean parameters
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
@@ -5310,7 +5708,9 @@ 
 				$invoicecache[$invoiceid] = new Facture($this->db);
 				$invoicecache[$invoiceid]->fetch($invoiceid);
 			}
-			if ($invoicecache[$invoiceid]->type != Facture::TYPE_SITUATION) return 0;
+			if ($invoicecache[$invoiceid]->type != Facture::TYPE_SITUATION) {
+				return 0;
+			}
 
 			$sql = 'SELECT situation_percent FROM '.MAIN_DB_PREFIX.'facturedet WHERE rowid='.$this->fk_prev_id;
 			$resql = $this->db->query($sql);

htdocs/modulebuilder/template/myobject_list.php

Braces +181 added lines, -66 removed lines

@@ -44,17 +44,31 @@ 
 // Load Dolibarr environment
 $res = 0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
 // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
 $tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
 while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
 // Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
-if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
-if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
-if (!$res) die("Include of main fails");
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -104,23 +118,32 @@ 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "t.".key($object->fields);
+}
+// Set here default search field. By default 1st field in definition.
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Initialize array of search criterias
 $search_all = GETPOST('search_all', 'alphanohtml') ? trim(GETPOST('search_all', 'alphanohtml')) : trim(GETPOST('sall', 'alphanohtml'));
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
-}
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+	}
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val)
 {
-	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
-}
+	if ($val['searchall']) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
+	}
 
 // Definition of fields for list
 $arrayfields = array();
@@ -160,13 +183,17 @@ 
 $permissiontodelete = $user->rights->mymodule->myobject->delete;
 
 // Security check
-if (empty($conf->mymodule->enabled)) accessforbidden('Module not enabled');
+if (empty($conf->mymodule->enabled)) {
+	accessforbidden('Module not enabled');
+}
 $socid = 0;
-if ($user->socid > 0)	// Protection if external user
+if ($user->socid > 0) {
+	// Protection if external user
 {
 	//$socid = $user->socid;
 	accessforbidden();
 }
+}
 //$result = restrictedArea($user, 'mymodule', $id, '');
 //if (!$permissiontoread) accessforbidden();
 
@@ -181,7 +208,9 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -189,11 +218,13 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		// All tests are required to be compatible with all browsers
 	{
 		foreach ($object->fields as $key => $val)
 		{
 			$search[$key] = '';
+	}
 		}
 		$toselect = '';
 		$search_array_options = array();
@@ -235,28 +266,43 @@ 
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
-}
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+	}
+	}
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
-else $sql .= " WHERE 1 = 1";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+if ($object->ismultientitymanaged == 1) {
+	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+} else {
+	$sql .= " WHERE 1 = 1";
+}
 foreach ($search as $key => $val)
 {
-	if ($key == 'status' && $search[$key] == -1) continue;
+	if ($key == 'status' && $search[$key] == -1) {
+		continue;
+	}
 	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
 	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
-		if ($search[$key] == '-1') $search[$key] = '';
+		if ($search[$key] == '-1') {
+			$search[$key] = '';
+		}
 		$mode_search = 2;
 	}
-	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	if ($search[$key] != '') {
+		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	}
+	}
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 //$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -290,9 +336,11 @@ 
 {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total of record found is smaller than page * limit, goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -301,7 +349,9 @@ 
 {
 	$num = $nbtotalofrecords;
 } else {
-	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+	if ($limit) {
+		$sql .= $db->plimit($limit + 1, $offset);
+	}
 
 	$resql = $db->query($sql);
 	if (!$resql)
@@ -346,14 +396,23 @@ 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
 foreach ($search as $key => $val)
 {
-	if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
-	else $param .= '&search_'.$key.'='.urlencode($search[$key]);
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
+	} else {
+		$param .= '&search_'.$key.'='.urlencode($search[$key]);
+	}
+	}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
 }
-if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -364,12 +423,18 @@ 
 	//'builddoc'=>$langs->trans("PDFMerge"),
 	//'presend'=>$langs->trans("SendByMail"),
 );
-if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($permissiontodelete) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -391,7 +456,9 @@ 
 
 if ($search_all)
 {
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -402,8 +469,11 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
 
 if (!empty($moreforfilter))
 {
@@ -426,17 +496,25 @@ 
 foreach ($object->fields as $key => $val)
 {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
-		elseif (strpos($val['type'], 'integer:') === 0) {
+		if (is_array($val['arrayofkeyval'])) {
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		} elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		}
 		print '</td>';
 	}
 }
@@ -461,10 +539,15 @@ 
 foreach ($object->fields as $key => $val)
 {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
@@ -487,7 +570,10 @@ 
 {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
 	{
-		if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
+		if (preg_match('/\$object/', $val)) {
+			$needToFetchEachLine++;
+		}
+		// There is at least one compute field that use $object
 	}
 }
 
@@ -499,7 +585,10 @@ 
 while ($i < ($limit ? min($num, $limit) : $num))
 {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break; // Should not happen
+	if (empty($obj)) {
+		break;
+	}
+	// Should not happen
 
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
@@ -509,25 +598,40 @@ 
 	foreach ($object->fields as $key => $val)
 	{
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		}
 
-		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
+		}
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 		if (!empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') print $object->getLibStatut(5);
-			else print $object->showOutputField($val, $key, $object->$key, '');
+			if ($key == 'status') {
+				print $object->getLibStatut(5);
+			} else {
+				print $object->showOutputField($val, $key, $object->$key, '');
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 			if (!empty($val['isameasure']))
 			{
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
@@ -540,14 +644,20 @@ 
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	if ($massactionbutton || $massaction) {
+		// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
 		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) $selected = 1;
+	}
+		if (in_array($object->id, $arrayofselected)) {
+			$selected = 1;
+		}
 		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>'."\n";
 
@@ -561,7 +671,10 @@ 
 if ($num == 0)
 {
 	$colspan = 1;
-	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) {
+		$colspan++;
+	}
+	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
@@ -580,7 +693,9 @@ 
 if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);

htdocs/core/class/commonobject.class.php

Spacing +11 added lines, -11 removed lines

@@ -697,7 +697,7 @@ 
 
 				if (!empty($extralanguages->attributes[$elementforaltlanguage]['address']) || !empty($extralanguages->attributes[$elementforaltlanguage]['town']))
 				{
-					$out .= "<!-- alternatelanguage for '".$elementforaltlanguage."' set to fields '".join(',', $extralanguages->attributes[$elementforaltlanguage]). "' -->\n";
+					$out .= "<!-- alternatelanguage for '".$elementforaltlanguage."' set to fields '".join(',', $extralanguages->attributes[$elementforaltlanguage])."' -->\n";
 					$this->fetchValuesForExtraLanguages();
 					if (!is_object($form)) $form = new Form($this->db);
 					$htmltext = '';
@@ -1816,7 +1816,7 @@ 
 		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
 		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
-		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($fieldid=='rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($fieldid == 'rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
 		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
 		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
 		if (!empty($filter))
@@ -1869,7 +1869,7 @@ 
 		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
 		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
-		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($fieldid=='rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($fieldid == 'rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
 		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
 		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
 		if (!empty($filter))
@@ -4786,7 +4786,7 @@ 
 				    return -1;
 			    }
 		    } else {
-		    	if (! $filefound) {
+		    	if (!$filefound) {
 			    	$this->error = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelspath.' - modele='.$modele;
 			    	dol_print_error('', $this->error);
 		    	} else {
@@ -6724,8 +6724,8 @@ 
 
 		$out = '';
 
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('showOptionals', $parameters, $this, $action); // Note that $action and $object may have been modified by hook
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('showOptionals', $parameters, $this, $action); // Note that $action and $object may have been modified by hook
 		if (empty($reshook))
 		{
 			if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0)
@@ -7976,7 +7976,7 @@ 
             foreach ($this->childtablesoncascade as $table)
             {
 	            $deleteFromObject = explode(':', $table);
-	            if (count($deleteFromObject)>=2) {
+	            if (count($deleteFromObject) >= 2) {
 		            $className = str_replace('@', '', $deleteFromObject[0]);
 		            $filePath = $deleteFromObject[1];
 		            $columnName = $deleteFromObject[2];
@@ -7996,12 +7996,12 @@ 
 						}
 		            } else {
 			            $error++;
-						$this->errors[] = 'Cannot include child class file ' .$filePath;
+						$this->errors[] = 'Cannot include child class file '.$filePath;
 			            break;
 		            }
 	            } else {
 	            	// Delete record in child table
-	            	$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $table . ' WHERE ' . $this->fk_element . ' = ' . $this->id;
+	            	$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
 
 		            $resql = $this->db->query($sql);
 		            if (!$resql) {
@@ -8068,8 +8068,8 @@ 
 		if (!empty($parentId) && !empty($parentField)) {
 			$this->db->begin();
 
-			$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE '.$parentField.' = ' . (int) $parentId;
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' WHERE '.$parentField.' = '.(int) $parentId;
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {

Braces +1305 added lines, -459 removed lines

@@ -475,23 +475,31 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX.$element;
 		$sql .= " WHERE entity IN (".getEntity($element).")";
 
-		if ($id > 0) $sql .= " AND rowid = ".$db->escape($id);
-		elseif ($ref) $sql .= " AND ref = '".$db->escape($ref)."'";
-		elseif ($ref_ext) $sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";
-		else {
+		if ($id > 0) {
+			$sql .= " AND rowid = ".$db->escape($id);
+		} elseif ($ref) {
+			$sql .= " AND ref = '".$db->escape($ref)."'";
+		} elseif ($ref_ext) {
+			$sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";
+		} else {
 			$error = 'ErrorWrongParameters';
 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
 			return -1;
 		}
-		if ($ref || $ref_ext) $sql .= " AND entity = ".$conf->entity;
+		if ($ref || $ref_ext) {
+			$sql .= " AND entity = ".$conf->entity;
+		}
 
 		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			if ($num > 0) return 1;
-			else return 0;
+			if ($num > 0) {
+				return 1;
+			} else {
+				return 0;
+			}
 		}
 		return -1;
 	}
@@ -561,13 +569,18 @@ 
 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
 		$lastname = $this->lastname;
 		$firstname = $this->firstname;
-		if (empty($lastname))  $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
+		if (empty($lastname)) {
+			$lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
+		}
 
 		$ret = '';
 		if ($option && $this->civility_code)
 		{
-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_code) != "Civility".$this->civility_code) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_code).' ';
-			else $ret .= $this->civility_code.' ';
+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_code) != "Civility".$this->civility_code) {
+				$ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_code).' ';
+			} else {
+				$ret .= $this->civility_code.' ';
+			}
 		}
 
 		$ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);
@@ -686,7 +699,9 @@ 
 
 			// List of extra languages
 			$arrayoflangcode = array();
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) $arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) {
+				$arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+			}
 
 			if (is_array($arrayoflangcode) && count($arrayoflangcode)) {
 				if (!is_object($extralanguages)) {
@@ -699,7 +714,9 @@ 
 				{
 					$out .= "<!-- alternatelanguage for '".$elementforaltlanguage."' set to fields '".join(',', $extralanguages->attributes[$elementforaltlanguage]). "' -->\n";
 					$this->fetchValuesForExtraLanguages();
-					if (!is_object($form)) $form = new Form($this->db);
+					if (!is_object($form)) {
+						$form = new Form($this->db);
+					}
 					$htmltext = '';
 					// If there is extra languages
 					foreach ($arrayoflangcode as $extralangcode) {
@@ -723,7 +740,9 @@ 
 			$outdone++;
 		}
 
-		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) $out .= ($outdone ? '<br>' : '');
+		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) {
+			$out .= ($outdone ? '<br>' : '');
+		}
 		if (!empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
 			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
@@ -749,7 +768,9 @@ 
 			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
 		}
 
-		if ($out) $out .= '<div style="clear: both;"></div>';
+		if ($out) {
+			$out .= '<div style="clear: both;"></div>';
+		}
 		$outdone = 0;
 		if (!empty($this->email))
 		{
@@ -773,15 +794,25 @@ 
 					$outdone++;
 				}
 			} else {
-				if ($this->skype) $outsocialnetwork .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+				if ($this->skype) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+				}
 				$outdone++;
-				if ($this->jabberid) $outsocialnetwork .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+				if ($this->jabberid) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+				}
 				$outdone++;
-				if ($this->twitter) $outsocialnetwork .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+				if ($this->twitter) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+				}
 				$outdone++;
-				if ($this->facebook) $outsocialnetwork .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+				if ($this->facebook) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+				}
 				$outdone++;
-				if ($this->linkedin) $outsocialnetwork .= dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+				if ($this->linkedin) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+				}
 				$outdone++;
 			}
 
@@ -790,8 +821,11 @@ 
 			}
 		}
 
-		if ($out) return '<!-- BEGIN part to show address block -->'."\n".$out.'<!-- END Part to show address block -->'."\n";
-		else return '';
+		if ($out) {
+			return '<!-- BEGIN part to show address block -->'."\n".$out.'<!-- END Part to show address block -->'."\n";
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -844,7 +878,9 @@ 
 					$this->errors = $ecmfile->errors;
 				}
 				*/
-			} else return '';
+			} else {
+				return '';
+			}
 		} elseif (empty($ecmfile->share))
 		{
 			// Add entry into index
@@ -853,7 +889,9 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				$ecmfile->share = getRandomPassword(true);
 				$ecmfile->update($user);
-			} else return '';
+			} else {
+				return '';
+			}
 		}
 		// Define $urlwithroot
 		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -869,8 +907,13 @@ 
 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
-		if (!empty($ecmfile->share)) $paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share; // Hash for public share
-		if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		if (!empty($ecmfile->share)) {
+			$paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share;
+		}
+		// Hash for public share
+		if ($forcedownload) {
+			$paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		}
 
 		if ($relativelink)
 		{
@@ -934,7 +977,9 @@ 
 			if ($resql)
 			{
 				$obj = $this->db->fetch_object($resql);
-				if ($obj) $id_type_contact = $obj->rowid;
+				if ($obj) {
+					$id_type_contact = $obj->rowid;
+				}
 			}
 		}
 
@@ -998,7 +1043,9 @@ 
 					return -1;
 				}
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1040,8 +1087,12 @@ 
 		// Insert into database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
 		$sql .= " statut = ".$statut;
-		if ($type_contact_id) $sql .= ", fk_c_type_contact = '".$type_contact_id."'";
-		if ($fk_socpeople) $sql .= ", fk_socpeople = '".$fk_socpeople."'";
+		if ($type_contact_id) {
+			$sql .= ", fk_c_type_contact = '".$type_contact_id."'";
+		}
+		if ($fk_socpeople) {
+			$sql .= ", fk_socpeople = '".$fk_socpeople."'";
+		}
 		$sql .= " where rowid = ".$rowid;
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -1112,8 +1163,9 @@ 
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
 		$sql .= " WHERE element_id = ".$this->id;
-		if ($listId)
-			$sql .= " AND fk_c_type_contact IN (".$listId.")";
+		if ($listId) {
+					$sql .= " AND fk_c_type_contact IN (".$listId.")";
+		}
 
 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -1143,22 +1195,38 @@ 
 		$tab = array();
 
 		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact"; // This field contains id of llx_socpeople or id of llx_user
-		if ($source == 'internal') $sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
-		if ($source == 'external' || $source == 'thirdparty') $sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+		if ($source == 'internal') {
+			$sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+			$sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+		}
 		$sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
 		$sql .= ", tc.source, tc.element, tc.code, tc.libelle";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
 		$sql .= ", ".MAIN_DB_PREFIX."element_contact ec";
-		if ($source == 'internal') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
-		if ($source == 'external' || $source == 'thirdparty') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		if ($source == 'internal') {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		}
 		$sql .= " WHERE ec.element_id =".$this->id;
 		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
 		$sql .= " AND tc.element='".$this->db->escape($this->element)."'";
-		if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";
-		if ($source == 'internal') $sql .= " AND tc.source = 'internal'";
-		if ($source == 'external' || $source == 'thirdparty') $sql .= " AND tc.source = 'external'";
+		if ($code) {
+			$sql .= " AND tc.code = '".$this->db->escape($code)."'";
+		}
+		if ($source == 'internal') {
+			$sql .= " AND tc.source = 'internal'";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+			$sql .= " AND tc.source = 'external'";
+		}
 		$sql .= " AND tc.active=1";
-		if ($status >= 0) $sql .= " AND ec.statut = ".$status;
+		if ($status >= 0) {
+			$sql .= " AND ec.statut = ".$status;
+		}
 		$sql .= " ORDER BY t.lastname ASC";
 
 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
@@ -1244,16 +1312,27 @@ 
         // phpcs:enable
 		global $langs;
 
-		if (empty($order)) $order = 'position';
-		if ($order == 'position') $order .= ',code';
+		if (empty($order)) {
+			$order = 'position';
+		}
+		if ($order == 'position') {
+			$order .= ',code';
+		}
 
 		$tab = array();
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
-		if ($activeonly == 1) $sql .= " AND tc.active=1"; // only the active types
-		if (!empty($source) && $source != 'all') $sql .= " AND tc.source='".$this->db->escape($source)."'";
-		if (!empty($code)) $sql .= " AND tc.code='".$this->db->escape($code)."'";
+		if ($activeonly == 1) {
+			$sql .= " AND tc.active=1";
+		}
+		// only the active types
+		if (!empty($source) && $source != 'all') {
+			$sql .= " AND tc.source='".$this->db->escape($source)."'";
+		}
+		if (!empty($code)) {
+			$sql .= " AND tc.code='".$this->db->escape($code)."'";
+		}
 		$sql .= $this->db->order($order, 'ASC');
 
 		//print "sql=".$sql;
@@ -1268,8 +1347,11 @@ 
 
 				$transkey = "TypeContact_".$this->element."_".$source."_".$obj->code;
 				$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid] = $libelle_type;
-				else $tab[$obj->code] = $libelle_type;
+				if (empty($option)) {
+					$tab[$obj->rowid] = $libelle_type;
+				} else {
+					$tab[$obj->code] = $libelle_type;
+				}
 				$i++;
 			}
 			return $tab;
@@ -1310,14 +1392,18 @@ 
 			$sqlWhere[] = " tc.element <> '".$this->db->escape($excludeelement)."'";
 		}
 
-		if ($activeonly == 1)
-			$sqlWhere[] = " tc.active=1"; // only the active types
+		if ($activeonly == 1) {
+					$sqlWhere[] = " tc.active=1";
+		}
+		// only the active types
 
-		if (!empty($source) && $source != 'all')
-			$sqlWhere[] = " tc.source='".$this->db->escape($source)."'";
+		if (!empty($source) && $source != 'all') {
+					$sqlWhere[] = " tc.source='".$this->db->escape($source)."'";
+		}
 
-		if (!empty($code))
-			$sqlWhere[] = " tc.code='".$this->db->escape($code)."'";
+		if (!empty($code)) {
+					$sqlWhere[] = " tc.code='".$this->db->escape($code)."'";
+		}
 
 		if (count($sqlWhere) > 0) {
 			$sql .= " WHERE ".implode(' AND ', $sqlWhere);
@@ -1347,9 +1433,11 @@ 
 						$libelle_element = $langs->trans('ContactDefault_'.$obj->element);
 						$transkey = "TypeContact_".$obj->element."_".$source."_".$obj->code;
 						$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
-						if (empty($option))
+						if (empty($option)) {
+													$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
+						} else {
 							$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
-						else $tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
+						}
 					}
 				}
 			}
@@ -1391,19 +1479,31 @@ 
 
 		$sql = "SELECT ec.fk_socpeople";
 		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
-		if ($source == 'internal') $sql .= " ".MAIN_DB_PREFIX."user as c,";
-		if ($source == 'external') $sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+		if ($source == 'internal') {
+			$sql .= " ".MAIN_DB_PREFIX."user as c,";
+		}
+		if ($source == 'external') {
+			$sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+		}
 		$sql .= " ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql .= " WHERE ec.element_id = ".$id;
 		$sql .= " AND ec.fk_socpeople = c.rowid";
-		if ($source == 'internal') $sql .= " AND c.entity IN (".getEntity('user').")";
-		if ($source == 'external') $sql .= " AND c.entity IN (".getEntity('societe').")";
+		if ($source == 'internal') {
+			$sql .= " AND c.entity IN (".getEntity('user').")";
+		}
+		if ($source == 'external') {
+			$sql .= " AND c.entity IN (".getEntity('societe').")";
+		}
 		$sql .= " AND ec.fk_c_type_contact = tc.rowid";
 		$sql .= " AND tc.element = '".$element."'";
 		$sql .= " AND tc.source = '".$source."'";
-		if ($code) $sql .= " AND tc.code = '".$code."'";
+		if ($code) {
+			$sql .= " AND tc.code = '".$code."'";
+		}
 		$sql .= " AND tc.active = 1";
-		if ($status) $sql .= " AND ec.statut = ".$status;
+		if ($status) {
+			$sql .= " AND ec.statut = ".$status;
+		}
 
 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1432,9 +1532,13 @@ 
 	public function fetch_contact($contactid = null)
 	{
         // phpcs:enable
-		if (empty($contactid)) $contactid = $this->contact_id;
+		if (empty($contactid)) {
+			$contactid = $this->contact_id;
+		}
 
-		if (empty($contactid)) return 0;
+		if (empty($contactid)) {
+			return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
@@ -1455,14 +1559,16 @@ 
         // phpcs:enable
 		global $conf;
 
-		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
-			return 0;
+		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) {
+					return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
-		if ($force_thirdparty_id)
-			$idtofetch = $force_thirdparty_id;
+		if ($force_thirdparty_id) {
+					$idtofetch = $force_thirdparty_id;
+		}
 
 		if ($idtofetch) {
 			$thirdparty = new Societe($this->db);
@@ -1475,7 +1581,9 @@ 
 			}
 
 			return $result;
-		} else return -1;
+		} else {
+			return -1;
+		}
 	}
 
 
@@ -1521,18 +1629,24 @@ 
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
 
 		$idtype = $this->barcode_type;
-		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
+		if (empty($idtype) && $idtype != '0') {
+			// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
 		{
 			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-			elseif ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
-			else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+		} elseif ($this->element == 'societe') {
+				$idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+			} else {
+				dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+			}
 		}
 
 		if ($idtype > 0)
 		{
-			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
+			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) {
+				// If data not already loaded
 			{
 				$sql = "SELECT rowid, code, libelle as label, coder";
+			}
 				$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
 				$sql .= " WHERE rowid = ".$idtype;
 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
@@ -1565,8 +1679,13 @@ 
         // phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet; // For backward compatibility
-		if (empty($this->fk_project)) return 0;
+		if (empty($this->fk_project) && !empty($this->fk_projet)) {
+			$this->fk_project = $this->fk_projet;
+		}
+		// For backward compatibility
+		if (empty($this->fk_project)) {
+			return 0;
+		}
 
 		$project = new Project($this->db);
 		$result = $project->fetch($this->fk_project);
@@ -1587,7 +1706,9 @@ 
         // phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-		if (empty($this->fk_product)) return 0;
+		if (empty($this->fk_product)) {
+			return 0;
+		}
 
 		$product = new Product($this->db);
 		$result = $product->fetch($this->fk_product);
@@ -1621,9 +1742,15 @@ 
 	public function fetch_origin()
 	{
         // phpcs:enable
-		if ($this->origin == 'shipping') $this->origin = 'expedition';
-		if ($this->origin == 'delivery') $this->origin = 'livraison';
-        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';
+		if ($this->origin == 'shipping') {
+			$this->origin = 'expedition';
+		}
+		if ($this->origin == 'delivery') {
+			$this->origin = 'livraison';
+		}
+        if ($this->origin == 'order_supplier') {
+        	$this->origin = 'commandeFournisseur';
+        }
 
 		$origin = $this->origin;
 
@@ -1715,29 +1842,48 @@ 
 	{
 		global $user, $langs, $conf;
 
-		if (empty($table)) 	  $table = $this->table_element;
-		if (empty($id))    	  $id = $this->id;
-		if (empty($format))   $format = 'text';
-		if (empty($id_field)) $id_field = 'rowid';
+		if (empty($table)) {
+			$table = $this->table_element;
+		}
+		if (empty($id)) {
+			$id = $this->id;
+		}
+		if (empty($format)) {
+			$format = 'text';
+		}
+		if (empty($id_field)) {
+			$id_field = 'rowid';
+		}
 
 		$error = 0;
 
 		$this->db->begin();
 
 		// Special case
-		if ($table == 'product' && $field == 'note_private') $field = 'note';
-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
+		if ($table == 'product' && $field == 'note_private') {
+			$field = 'note';
+		}
+		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
+			$fk_user_field = 'fk_user_mod';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 
-		if ($format == 'text') $sql .= $field." = '".$this->db->escape($value)."'";
-		elseif ($format == 'int') $sql .= $field." = ".$this->db->escape($value);
-		elseif ($format == 'date') $sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		if ($format == 'text') {
+			$sql .= $field." = '".$this->db->escape($value)."'";
+		} elseif ($format == 'int') {
+			$sql .= $field." = ".$this->db->escape($value);
+		} elseif ($format == 'date') {
+			$sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		}
 
 		if ($fk_user_field)
 		{
-			if (!empty($fuser) && is_object($fuser)) $sql .= ", ".$fk_user_field." = ".$fuser->id;
-			elseif (empty($fuser) || $fuser != 'none') $sql .= ", ".$fk_user_field." = ".$user->id;
+			if (!empty($fuser) && is_object($fuser)) {
+				$sql .= ", ".$fk_user_field." = ".$fuser->id;
+			} elseif (empty($fuser) || $fuser != 'none') {
+				$sql .= ", ".$fk_user_field." = ".$user->id;
+			}
 		}
 
 		$sql .= " WHERE ".$id_field." = ".$id;
@@ -1755,13 +1901,20 @@ 
 				} else {
 					$result = $this->fetchCommon($id);
 				}
-				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
-				if ($result < 0) $error++;
+				if ($result >= 0) {
+					$result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user);
+				}
+				// This may set this->errors
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			if (!$error)
 			{
-				if (property_exists($this, $field)) $this->$field = $value;
+				if (property_exists($this, $field)) {
+					$this->$field = $value;
+				}
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1794,16 +1947,23 @@ 
 			dol_print_error('', get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
 			return -1;
 		}
-		if ($fieldid == 'none') return 1;
+		if ($fieldid == 'none') {
+			return 1;
+		}
 
 		// Security on socid
 		$socid = 0;
-		if ($user->socid > 0) $socid = $user->socid;
+		if ($user->socid > 0) {
+			$socid = $user->socid;
+		}
 
 		// this->ismultientitymanaged contains
 		// 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
 		$aliastablesociete = 's';
-		if ($this->element == 'societe') $aliastablesociete = 'te'; // te as table_element
+		if ($this->element == 'societe') {
+			$aliastablesociete = 'te';
+		}
+		// te as table_element
 
 		$sql = "SELECT MAX(te.".$fieldid.")";
 		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";
@@ -1813,21 +1973,39 @@ 
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid
+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		}
 		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($fieldid=='rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND sc.fk_user = ".$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (!empty($filter))
 		{
-			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+			if (!preg_match('/^\s*AND/i', $filter)) {
+				$sql .= " AND ";
+			}
+			// For backward compatibility
 			$sql .= $filter;
 		}
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1844,9 +2022,15 @@ 
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+			$sql .= ' AND te.fk_soc = '.$socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+			$sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+			$sql .= ' AND te.rowid = '.$socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
 		$result = $this->db->query($sql);
@@ -1866,21 +2050,39 @@ 
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid
+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		}
 		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($fieldid=='rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND sc.fk_user = ".$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (!empty($filter))
 		{
-			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+			if (!preg_match('/^\s*AND/i', $filter)) {
+				$sql .= " AND ";
+			}
+			// For backward compatibility
 			$sql .= $filter;
 		}
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1897,9 +2099,15 @@ 
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+			$sql .= ' AND te.fk_soc = '.$socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+			$sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+			$sql .= ' AND te.rowid = '.$socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
@@ -1931,8 +2139,11 @@ 
 		$i = 0;
 		while ($i < $num)
 		{
-			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else $contactAlreadySelected[$i] = $tab[$i]['id'];
+			if ($source == 'thirdparty') {
+				$contactAlreadySelected[$i] = $tab[$i]['socid'];
+			} else {
+				$contactAlreadySelected[$i] = $tab[$i]['id'];
+			}
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -1954,20 +2165,29 @@ 
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		if (!empty($this->fields['fk_project']))		// Common case
+		if (!empty($this->fields['fk_project'])) {
+			// Common case
 		{
 			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
-			else $sql .= ' SET fk_project = NULL';
+		} else {
+				$sql .= ' SET fk_project = NULL';
+			}
 			$sql .= ' WHERE rowid = '.$this->id;
-		} elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
+		} elseif ($this->table_element == 'actioncomm') {
+			// Special case for actioncomm
 		{
 			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
-			else $sql .= ' SET fk_project = NULL';
+		} else {
+				$sql .= ' SET fk_project = NULL';
+			}
 			$sql .= ' WHERE id = '.$this->id;
 		} else // Special case for old architecture objects
 		{
-			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;
-			else $sql .= ' SET fk_projet = NULL';
+			if ($projectid) {
+				$sql .= ' SET fk_projet = '.$projectid;
+			} else {
+				$sql .= ' SET fk_projet = NULL';
+			}
 			$sql .= ' WHERE rowid = '.$this->id;
 		}
 
@@ -1995,8 +2215,12 @@ 
 		{
 			// TODO uniformize field name
 			$fieldname = 'fk_mode_reglement';
-			if ($this->element == 'societe') $fieldname = 'mode_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';
+			if ($this->element == 'societe') {
+				$fieldname = 'mode_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+				$fieldname = 'mode_reglement_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
@@ -2006,7 +2230,9 @@ 
 			{
 				$this->mode_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+					$this->mode_reglement_supplier_id = $id;
+				}
 				return 1;
 			} else {
 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
@@ -2042,7 +2268,9 @@ 
 				$this->multicurrency_code = $code;
 
 				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
-				if ($rate) $this->setMulticurrencyRate($rate, 2);
+				if ($rate) {
+					$this->setMulticurrencyRate($rate, 2);
+				}
 
 				return 1;
 			} else {
@@ -2174,8 +2402,12 @@ 
 		{
 			// TODO uniformize field name
 			$fieldname = 'fk_cond_reglement';
-			if ($this->element == 'societe') $fieldname = 'cond_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';
+			if ($this->element == 'societe') {
+				$fieldname = 'cond_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+				$fieldname = 'cond_reglement_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
@@ -2185,7 +2417,9 @@ 
 			{
 				$this->cond_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+					$this->cond_reglement_supplier_id = $id;
+				}
 				$this->cond_reglement = $id; // for compatibility
 				return 1;
 			} else {
@@ -2244,7 +2478,9 @@ 
 	public function setDeliveryAddress($id)
 	{
 		$fieldname = 'fk_delivery_address';
-		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
+		if ($this->element == 'delivery' || $this->element == 'shipping') {
+			$fieldname = 'fk_address';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
 		$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
@@ -2274,7 +2510,9 @@ 
 	{
 		global $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
@@ -2285,7 +2523,9 @@ 
 
 		$this->db->begin();
 
-		if ($shipping_method_id < 0) $shipping_method_id = 'NULL';
+		if ($shipping_method_id < 0) {
+			$shipping_method_id = 'NULL';
+		}
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2302,7 +2542,9 @@ 
 				// Call trigger
 				$this->context = array('shippingmethodupdate'=>1);
 				$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 		}
@@ -2330,7 +2572,9 @@ 
 			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
-		if ($warehouse_id < 0) $warehouse_id = 'NULL';
+		if ($warehouse_id < 0) {
+			$warehouse_id = 'NULL';
+		}
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2396,7 +2640,9 @@ 
 	{
 		global $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
@@ -2406,7 +2652,9 @@ 
 		}
 		$this->db->begin();
 
-		if ($fk_account < 0) $fk_account = 'NULL';
+		if ($fk_account < 0) {
+			$fk_account = 'NULL';
+		}
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2425,7 +2673,9 @@ 
 				// Call trigger
 				$this->context = array('bankaccountupdate'=>1);
 				$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 		}
@@ -2471,8 +2721,12 @@ 
 		$nl = 0;
 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql .= ' WHERE '.$this->fk_element.'='.$this->id;
-		if (!$renum) $sql .= ' AND rang = 0';
-		if ($renum) $sql .= ' AND rang <> 0';
+		if (!$renum) {
+			$sql .= ' AND rang = 0';
+		}
+		if ($renum) {
+			$sql .= ' AND rang <> 0';
+		}
 
 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2480,7 +2734,9 @@ 
 		{
 			$row = $this->db->fetch_row($resql);
 			$nl = $row[0];
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 		if ($nl > 0)
 		{
 			// The goal of this part is to reorder all lines, with all children lines sharing the same
@@ -2490,7 +2746,9 @@ 
 			// We first search all lines that are parent lines (for multilevel details lines)
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
-			if ($fk_parent_line) $sql .= ' AND fk_parent_line IS NULL';
+			if ($fk_parent_line) {
+				$sql .= ' AND fk_parent_line IS NULL';
+			}
 			$sql .= ' ORDER BY rang ASC, rowid '.$rowidorder;
 
 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
@@ -2552,7 +2810,9 @@ 
 			if ($this->db->num_rows($resql) > 0) {
 				while ($row = $this->db->fetch_row($resql)) {
 					$rows[] = $row[0];
-					if (!empty($includealltree)) $rows = array_merge($rows, $this->getChildrenOfLine($row[0]), $includealltree);
+					if (!empty($includealltree)) {
+						$rows = array_merge($rows, $this->getChildrenOfLine($row[0]), $includealltree);
+					}
 				}
 			}
 		}
@@ -2612,7 +2872,9 @@ 
 	public function updateRangOfLine($rowid, $rang)
 	{
 		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'
-		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) {
+			$fieldposition = 'position';
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 		$sql .= ' WHERE rowid = '.$rowid;
@@ -2653,7 +2915,9 @@ 
 		if ($rang > 1)
 		{
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+				$fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
@@ -2685,7 +2949,9 @@ 
 		if ($rang < $max)
 		{
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+				$fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
@@ -2754,7 +3020,9 @@ 
 	{
         // phpcs:enable
         $positionfield = 'rang';
-		if ($this->table_element == 'bom') $positionfield = 'position';
+		if ($this->table_element == 'bom') {
+			$positionfield = 'position';
+		}
 
 		// Search the last rang with fk_parent_line
 		if ($fk_parent_line)
@@ -2849,7 +3117,9 @@ 
 		}
 		// Special cas
 		//var_dump($this->table_element);exit;
-		if ($this->table_element == 'product') $suffix = '';
+		if ($this->table_element == 'product') {
+			$suffix = '';
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET note".$suffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");
@@ -2859,9 +3129,11 @@ 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-			if ($suffix == '_public') $this->note_public = $note;
-			elseif ($suffix == '_private') $this->note_private = $note;
-			else {
+			if ($suffix == '_public') {
+				$this->note_public = $note;
+			} elseif ($suffix == '_private') {
+				$this->note_private = $note;
+			} else {
 				$this->note = $note; // deprecated
 				$this->note_private = $note;
 			}
@@ -2913,36 +3185,45 @@ 
 
 		// Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)
 		$MODULE = "";
-		if ($this->element == 'propal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
-		elseif ($this->element == 'commande' || $this->element == 'order')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
-		elseif ($this->element == 'facture' || $this->element == 'invoice')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
-		elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice' || $this->element == 'invoice_supplier')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
-		elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
-		elseif ($this->element == 'supplier_proposal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		if ($this->element == 'propal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
+		} elseif ($this->element == 'commande' || $this->element == 'order') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
+		} elseif ($this->element == 'facture' || $this->element == 'invoice') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
+		} elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice' || $this->element == 'invoice_supplier') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
+		} elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
+		} elseif ($this->element == 'supplier_proposal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		}
 
 		if (!empty($MODULE)) {
 			if (!empty($conf->global->$MODULE)) {
 				$modsactivated = explode(',', $conf->global->$MODULE);
 				foreach ($modsactivated as $mod) {
-					if ($conf->$mod->enabled)
-						return 1; // update was disabled by specific setup
+					if ($conf->$mod->enabled) {
+											return 1;
+					}
+					// update was disabled by specific setup
 				}
 			}
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($roundingadjust == '-1') $roundingadjust = 'auto'; // For backward compatibility
+		if ($roundingadjust == '-1') {
+			$roundingadjust = 'auto';
+		}
+		// For backward compatibility
 
 		$forcedroundingmode = $roundingadjust;
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode = '0';
+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
+			$forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		} elseif ($forcedroundingmode == 'auto') {
+			$forcedroundingmode = '0';
+		}
 
 		$error = 0;
 
@@ -2965,15 +3246,22 @@ 
 
 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
 		$sql .= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
-		if ($this->table_element_line == 'facturedet') $sql .= ', situation_percent';
+		if ($this->table_element_line == 'facturedet') {
+			$sql .= ', situation_percent';
+		}
 		$sql .= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 		if ($exclspec)
 		{
 			$product_field = 'product_type';
-			if ($this->table_element_line == 'contratdet') $product_field = ''; // contratdet table has no product_type field
-			if ($product_field) $sql .= ' AND '.$product_field.' <> 9';
+			if ($this->table_element_line == 'contratdet') {
+				$product_field = '';
+			}
+			// contratdet table has no product_type field
+			if ($product_field) {
+				$sql .= ' AND '.$product_field.' <> 9';
+			}
 		}
 		$sql .= ' ORDER by rowid'; // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
@@ -3003,10 +3291,12 @@ 
 				$parameters = array('fk_element' => $obj->rowid);
 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
+				if (empty($reshook) && $forcedroundingmode == '0') {
+					// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
 				{
 					// This part of code is to fix data. We should not call it too often.
 					$localtax_array = array($obj->localtax1_type, $obj->localtax1_tx, $obj->localtax2_type, $obj->localtax2_tx);
+				}
 					$tmpcal = calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
 
 					$diff_when_using_price_ht = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1); // If price was set with tax price adn unit price HT has a low number of digits, then we may have a diff on recalculation from unit price HT.
@@ -3019,7 +3309,9 @@ 
 						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found unconsistent data into detailed line (diff_when_using_price_ht = '.$diff_when_using_price_ht.' and diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix, LOG_WARNING);
 						$resqlfix = $this->db->query($sqlfix);
-						if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
+						if (!$resqlfix) {
+							dol_print_error($this->db, 'Failed to update line');
+						}
 						$obj->total_tva = $tmpcal[1];
 						$obj->total_ttc = $tmpcal[2];
 					}
@@ -3034,16 +3326,24 @@ 
 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;
 
-				if (!isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate] = 0;
-				if (!isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate] = 0;
-				if (!isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate] = 0;
+				if (!isset($total_ht_by_vats[$obj->vatrate])) {
+					$total_ht_by_vats[$obj->vatrate] = 0;
+				}
+				if (!isset($total_tva_by_vats[$obj->vatrate])) {
+					$total_tva_by_vats[$obj->vatrate] = 0;
+				}
+				if (!isset($total_ttc_by_vats[$obj->vatrate])) {
+					$total_ttc_by_vats[$obj->vatrate] = 0;
+				}
 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;
 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
 
-				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
+				if ($forcedroundingmode == '1') {
+					// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
 				{
 					$tmpvat = price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+				}
 					$diff = price2num($total_tva_by_vats[$obj->vatrate] - $tmpvat, 'MT', 1);
 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
 					if ($diff)
@@ -3057,7 +3357,9 @@ 
 						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
 								$resqlfix = $this->db->query($sqlfix);
-								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
+								if (!$resqlfix) {
+									dol_print_error($this->db, 'Failed to update line');
+								}
 								$this->total_tva -= $diff;
 								$this->total_ttc -= $diff;
 								$total_tva_by_vats[$obj->vatrate] -= $diff;
@@ -3098,11 +3400,21 @@ 
 			$fieldlocaltax2 = 'localtax2';
 			$fieldttc = 'total_ttc';
 			// Specific code for backward compatibility with old field names
-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht = 'total';
-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva = 'total_tva';
-			if ($this->element == 'propal')                                                $fieldttc = 'total';
-			if ($this->element == 'expensereport')                                         $fieldtva = 'total_tva';
-			if ($this->element == 'supplier_proposal')                                     $fieldttc = 'total';
+			if ($this->element == 'facture' || $this->element == 'facturerec') {
+				$fieldht = 'total';
+			}
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
+				$fieldtva = 'total_tva';
+			}
+			if ($this->element == 'propal') {
+				$fieldttc = 'total';
+			}
+			if ($this->element == 'expensereport') {
+				$fieldtva = 'total_tva';
+			}
+			if ($this->element == 'supplier_proposal') {
+				$fieldttc = 'total';
+			}
 
 			if (empty($nodatabaseupdate))
 			{
@@ -3156,10 +3468,18 @@ 
 		$origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);
 
 		// Special case
-		if ($origin == 'order') $origin = 'commande';
-		if ($origin == 'invoice') $origin = 'facture';
-		if ($origin == 'invoice_template') $origin = 'facturerec';
-		if ($origin == 'supplierorder') $origin = 'order_supplier';
+		if ($origin == 'order') {
+			$origin = 'commande';
+		}
+		if ($origin == 'invoice') {
+			$origin = 'facture';
+		}
+		if ($origin == 'invoice_template') {
+			$origin = 'facturerec';
+		}
+		if ($origin == 'supplierorder') {
+			$origin = 'order_supplier';
+		}
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
@@ -3223,12 +3543,16 @@ 
 		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid))
 		{
 			$justsource = true; // the source (id and type) is a search criteria
-			if (!empty($targettype)) $withtargettype = true;
+			if (!empty($targettype)) {
+				$withtargettype = true;
+			}
 		}
 		if (!empty($targetid) && !empty($targettype) && empty($sourceid))
 		{
 			$justtarget = true; // the target (id and type) is a search criteria
-			if (!empty($sourcetype)) $withsourcetype = true;
+			if (!empty($sourcetype)) {
+				$withsourcetype = true;
+			}
 		}
 
 		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
@@ -3251,11 +3575,15 @@ 
 			if ($justsource)
 			{
 				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
-				if ($withtargettype) $sql .= " AND targettype = '".$targettype."'";
+				if ($withtargettype) {
+					$sql .= " AND targettype = '".$targettype."'";
+				}
 			} elseif ($justtarget)
 			{
 				$sql .= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
-				if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'";
+				if ($withsourcetype) {
+					$sql .= " AND sourcetype = '".$sourcetype."'";
+				}
 			}
 		} else {
 			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
@@ -3297,10 +3625,12 @@ 
 			if (!empty($this->linkedObjectsIds))
 			{
 				$tmparray = $this->linkedObjectsIds;
-				foreach ($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
+				foreach ($tmparray as $objecttype => $objectids) {
+					// $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
 				{
 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
 					$module = $element = $subelement = $objecttype;
+				}
 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
 						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
 					{
@@ -3360,9 +3690,11 @@ 
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
 							if (class_exists($classname))
 							{
-								foreach ($objectids as $i => $objectid)	// $i is rowid into llx_element_element
+								foreach ($objectids as $i => $objectid) {
+									// $i is rowid into llx_element_element
 								{
 									$object = new $classname($this->db);
+								}
 									$ret = $object->fetch($objectid);
 									if ($ret >= 0)
 									{
@@ -3398,8 +3730,11 @@ 
 		$updatesource = false;
 		$updatetarget = false;
 
-		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;
-		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) {
+			$updatesource = true;
+		} elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) {
+			$updatetarget = true;
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
 		if ($updatesource)
@@ -3442,8 +3777,11 @@ 
 		$deletesource = false;
 		$deletetarget = false;
 
-		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource = true;
-		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $deletetarget = true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) {
+			$deletesource = true;
+		} elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) {
+			$deletetarget = true;
+		}
 
 		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
 		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
@@ -3503,18 +3841,34 @@ 
 		$this->db->begin();
 
 		$fieldstatus = "fk_statut";
-		if ($elementTable == 'facture_rec') $fieldstatus = "suspended";
-		if ($elementTable == 'mailing') $fieldstatus = "statut";
-		if ($elementTable == 'cronjob') $fieldstatus = "status";
-		if ($elementTable == 'user') $fieldstatus = "statut";
-		if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";
-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";
-		if (is_array($this->fields) && array_key_exists('status', $this->fields)) $fieldstatus = 'status';
+		if ($elementTable == 'facture_rec') {
+			$fieldstatus = "suspended";
+		}
+		if ($elementTable == 'mailing') {
+			$fieldstatus = "statut";
+		}
+		if ($elementTable == 'cronjob') {
+			$fieldstatus = "status";
+		}
+		if ($elementTable == 'user') {
+			$fieldstatus = "statut";
+		}
+		if ($elementTable == 'expensereport') {
+			$fieldstatus = "fk_statut";
+		}
+		if ($elementTable == 'commande_fournisseur_dispatch') {
+			$fieldstatus = "status";
+		}
+		if (is_array($this->fields) && array_key_exists('status', $this->fields)) {
+			$fieldstatus = 'status';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
 		$sql .= " SET ".$fieldstatus." = ".$status;
 		// If status = 1 = validated, update also fk_user_valid
-		if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = ".$user->id;
+		if ($status == 1 && $elementTable == 'expensereport') {
+			$sql .= ", fk_user_valid = ".$user->id;
+		}
 		$sql .= " WHERE rowid=".$elementId;
 
 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
@@ -3525,19 +3879,36 @@ 
 			// Try autoset of trigkey
 			if (empty($trigkey))
 			{
-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey = 'SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey = 'SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey = 'SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
-				if ($this->element == 'fichinter' && $status == 3) $trigkey = 'FICHINTER_CLASSIFY_DONE';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey = 'FICHINTER_CLASSIFY_BILLED';
-				if ($this->element == 'fichinter' && $status == 1) $trigkey = 'FICHINTER_CLASSIFY_UNBILLED';
+				if ($this->element == 'supplier_proposal' && $status == 2) {
+					$trigkey = 'SUPPLIER_PROPOSAL_SIGN';
+				}
+				// 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 3) {
+					$trigkey = 'SUPPLIER_PROPOSAL_REFUSE';
+				}
+				// 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 4) {
+					$trigkey = 'SUPPLIER_PROPOSAL_CLOSE';
+				}
+				// 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
+				if ($this->element == 'fichinter' && $status == 3) {
+					$trigkey = 'FICHINTER_CLASSIFY_DONE';
+				}
+				if ($this->element == 'fichinter' && $status == 2) {
+					$trigkey = 'FICHINTER_CLASSIFY_BILLED';
+				}
+				if ($this->element == 'fichinter' && $status == 1) {
+					$trigkey = 'FICHINTER_CLASSIFY_UNBILLED';
+				}
 			}
 
 			if ($trigkey)
 			{
 				// Call trigger
 				$result = $this->call_trigger($trigkey, $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -3545,9 +3916,11 @@ 
 			{
 				$this->db->commit();
 
-				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
+				if (empty($savElementId)) {
+					// If the element we update was $this (so $elementId is null)
 				{
 					$this->statut = $status;
+				}
 					$this->status = $status;
 				}
 
@@ -3576,8 +3949,13 @@ 
 	{
 		global $conf;
 
-		if (empty($id) && empty($ref)) return 0;
-		if (!empty($conf->global->MAIN_DISABLE_CANVAS)) return 0; // To increase speed. Not enabled by default.
+		if (empty($id) && empty($ref)) {
+			return 0;
+		}
+		if (!empty($conf->global->MAIN_DISABLE_CANVAS)) {
+			return 0;
+		}
+		// To increase speed. Not enabled by default.
 
 		// Clean parameters
 		$ref = trim($ref);
@@ -3585,8 +3963,12 @@ 
 		$sql = "SELECT rowid, canvas";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " WHERE entity IN (".getEntity($this->element).")";
-		if (!empty($id))  $sql .= " AND rowid = ".$id;
-		if (!empty($ref)) $sql .= " AND ref = '".$this->db->escape($ref)."'";
+		if (!empty($id)) {
+			$sql .= " AND rowid = ".$id;
+		}
+		if (!empty($ref)) {
+			$sql .= " AND ref = '".$this->db->escape($ref)."'";
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -3596,7 +3978,9 @@ 
 			{
 				$this->canvas = $obj->canvas;
 				return 1;
-			} else return 0;
+			} else {
+				return 0;
+			}
 		} else {
 			dol_print_error($this->db);
 			return -1;
@@ -3633,7 +4017,9 @@ 
 	{
 		global $langs;
 
-		if (empty($id)) $id = $this->id;
+		if (empty($id)) {
+			$id = $this->id;
+		}
 
 		// Check parameters
 		if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0)
@@ -3667,9 +4053,11 @@ 
 					$langs->load("errors");
 					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;
 					$haschild += $obj->nb;
-					if (is_numeric($elementname))	// old usage
+					if (is_numeric($elementname)) {
+						// old usage
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
+					}
 					} else // new usage: $elementname=Translation key
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
@@ -3685,7 +4073,9 @@ 
 		{
 			$this->errors[] = "ErrorRecordHasChildren";
 			return $haschild;
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -3701,12 +4091,24 @@ 
 		foreach ($this->lines as $key => $val)
 		{
 			$qualified = 0;
-			if ($predefined == -1) $qualified = 1;
-			if ($predefined == 1 && $val->fk_product > 0) $qualified = 1;
-			if ($predefined == 0 && $val->fk_product <= 0) $qualified = 1;
-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) $qualified = 1;
-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) $qualified = 1;
-			if ($qualified) $nb++;
+			if ($predefined == -1) {
+				$qualified = 1;
+			}
+			if ($predefined == 1 && $val->fk_product > 0) {
+				$qualified = 1;
+			}
+			if ($predefined == 0 && $val->fk_product <= 0) {
+				$qualified = 1;
+			}
+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) {
+				$qualified = 1;
+			}
+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) {
+				$qualified = 1;
+			}
+			if ($qualified) {
+				$nb++;
+			}
 		}
 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
 		return $nb;
@@ -3770,16 +4172,24 @@ 
 		{
 			if (isset($line->qty_asked))
 			{
-				if (empty($totalOrdered)) $totalOrdered = 0; // Avoid warning because $totalOrdered is ''
+				if (empty($totalOrdered)) {
+					$totalOrdered = 0;
+				}
+				// Avoid warning because $totalOrdered is ''
 				$totalOrdered += $line->qty_asked; // defined for shipment only
 			}
 			if (isset($line->qty_shipped))
 			{
-				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''
+				if (empty($totalToShip)) {
+					$totalToShip = 0;
+				}
+				// Avoid warning because $totalToShip is ''
 				$totalToShip += $line->qty_shipped; // defined for shipment only
 			} elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
 			{
-				if (empty($totalToShip)) $totalToShip = 0;
+				if (empty($totalToShip)) {
+					$totalToShip = 0;
+				}
 				$totalToShip += $line->qty; // defined for reception only
 			}
 
@@ -3803,16 +4213,28 @@ 
 
 			$weightUnit = 0;
 			$volumeUnit = 0;
-			if (!empty($weight_units)) $weightUnit = $weight_units;
-			if (!empty($volume_units)) $volumeUnit = $volume_units;
+			if (!empty($weight_units)) {
+				$weightUnit = $weight_units;
+			}
+			if (!empty($volume_units)) {
+				$volumeUnit = $volume_units;
+			}
 
-			if (empty($totalWeight)) $totalWeight = 0; // Avoid warning because $totalWeight is ''
-			if (empty($totalVolume)) $totalVolume = 0; // Avoid warning because $totalVolume is ''
+			if (empty($totalWeight)) {
+				$totalWeight = 0;
+			}
+			// Avoid warning because $totalWeight is ''
+			if (empty($totalVolume)) {
+				$totalVolume = 0;
+			}
+			// Avoid warning because $totalVolume is ''
 
 			//var_dump($line->volume_units);
-			if ($weight_units < 50)   // < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+			if ($weight_units < 50) {
+				// < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				$trueWeightUnit = pow(10, $weightUnit);
+			}
 				$totalWeight += $weight * $qty * $trueWeightUnit;
 			} else {
 				if ($weight_units == 99) {
@@ -3827,10 +4249,12 @@ 
 					$totalWeight += $weight * $qty; // This may be wrong if we mix different units
 				}
 			}
-			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+			if ($volume_units < 50) {
+				// >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
 				$trueVolumeUnit = pow(10, $volumeUnit);
+			}
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
 			} else {
@@ -3958,7 +4382,9 @@ 
 				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
-		} else return -1;
+		} else {
+			return -1;
+		}
 	}
 
 
@@ -4008,7 +4434,9 @@ 
 			} else {
 				$res = include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 	}
 
@@ -4039,7 +4467,9 @@ 
 
 		// Define usemargins
 		$usemargins = 0;
-		if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) $usemargins = 1;
+		if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) {
+			$usemargins = 1;
+		}
 
 		$num = count($this->lines);
 
@@ -4072,7 +4502,9 @@ 
 				} else {
 					$res = include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 
@@ -4085,11 +4517,13 @@ 
 			$line->fetch_optionals();
 
 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
-			if (is_object($hookmanager))   // Old code is commented on preceding line.
+			if (is_object($hookmanager)) {
+				// Old code is commented on preceding line.
 			{
 				if (empty($line->fk_parent_line))
 				{
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
+			}
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				} else {
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
@@ -4163,8 +4597,13 @@ 
 
 					$outputlangs = $langs;
 					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-					if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) $newlang = $this->thirdparty->default_lang; // To use language of customer
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+						$newlang = GETPOST('lang_id', 'aZ09');
+					}
+					if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) {
+						$newlang = $this->thirdparty->default_lang;
+					}
+					// To use language of customer
 					if (!empty($newlang))
 					{
 						$outputlangs = new Translate("", $conf);
@@ -4200,7 +4639,9 @@ 
 				} else {
 					$res = include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 
@@ -4229,7 +4670,9 @@ 
 				} else {
 					$res = include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 	}
@@ -4257,7 +4700,9 @@ 
 		print '<td>'.$langs->trans('Description').'</td>';
 		print '<td class="right">'.$langs->trans('VATRate').'</td>';
 		print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
-		if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		if (!empty($conf->multicurrency->enabled)) {
+			print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		}
 		print '<td class="right">'.$langs->trans('Qty').'</td>';
 		if ($conf->global->PRODUCT_USE_UNITS)
 		{
@@ -4312,24 +4757,32 @@ 
 			$date_start = $line->date_start;
 		} else {
 			$date_start = $line->date_debut_prevue;
-			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;
+			if ($line->date_debut_reel) {
+				$date_start = $line->date_debut_reel;
+			}
 		}
 		if (!empty($line->date_end))
 		{
 			$date_end = $line->date_end;
 		} else {
 			$date_end = $line->date_fin_prevue;
-			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
+			if ($line->date_fin_reel) {
+				$date_end = $line->date_fin_reel;
+			}
 		}
 
         $this->tpl['id'] = $line->id;
 
 		$this->tpl['label'] = '';
-		if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');
+		if (!empty($line->fk_parent_line)) {
+			$this->tpl['label'] .= img_picto('', 'rightarrow');
+		}
 
-		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
+		if (($line->info_bits & 2) == 2) {
+			// TODO Not sure this is used for source object
 		{
 			$discount = new DiscountAbsolute($this->db);
+		}
 			$discount->fk_soc = $this->socid;
 			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');
 		} elseif (!empty($line->fk_product))
@@ -4367,14 +4820,18 @@ 
 
 		if (!empty($line->desc))
 		{
-			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
+			if ($line->desc == '(CREDIT_NOTE)') {
+				// TODO Not sure this is used for source object
 			{
 				$discount = new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-			} elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
+			} elseif ($line->desc == '(DEPOSIT)') {
+				// TODO Not sure this is used for source object
 			{
 				$discount = new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 			} elseif ($line->desc == '(EXCESS RECEIVED)')
@@ -4397,17 +4854,23 @@ 
         // VAT Rate
         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
+        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) {
+        	$this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
+        }
 
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
 		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
-		if ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		}
 		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
 
 		// Is the line strike or not
 		$this->tpl['strike'] = 0;
-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike'] = 1;
+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) {
+			$this->tpl['strike'] = 1;
+		}
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
@@ -4426,7 +4889,9 @@ 
 			} else {
 				$res = include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 	}
 
@@ -4577,13 +5042,20 @@ 
 			$classname = '';
 			$filefound = '';
 		    $dirmodels = array('/');
-		    if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+		    if (is_array($conf->modules_parts['models'])) {
+		    	$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+		    }
 		    foreach ($dirmodels as $reldir)
 		    {
 			    foreach (array('doc', 'pdf') as $prefix)
 			    {
-				    if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php
-				    else $file = $prefix."_".$modele.".modules.php";
+				    if (in_array(get_class($this), array('Adherent'))) {
+				    	$file = $prefix."_".$modele.".class.php";
+				    }
+				    // Member module use prefix_module.class.php
+				    else {
+				    	$file = $prefix."_".$modele.".modules.php";
+				    }
 
 				    // On verifie l'emplacement du modele
 				    $file = dol_buildpath($reldir.$modelspath.$file, 0);
@@ -4594,7 +5066,9 @@ 
 					    break;
 				    }
 			    }
-			    if ($filefound) break;
+			    if ($filefound) {
+			    	break;
+			    }
 		    }
 
 		    // If generator was found
@@ -4626,7 +5100,9 @@ 
 						    if (is_dir($tmpdir))
 						    {
 							    $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
-							    if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+							    if (count($tmpfiles)) {
+							    	$listoffiles = array_merge($listoffiles, $tmpfiles);
+							    }
 						    }
 					    }
 
@@ -4686,9 +5162,11 @@ 
 					    $destfile = basename($destfull);
 					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 
-					    if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+					    if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+					    	// If not a tmp dir
 					    {
 						    $filename = basename($destfile);
+					    }
 						    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 						    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
@@ -4701,8 +5179,12 @@ 
 						    if ($this->element == 'propal')
 						    {
 							    $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
-							    if ($useonlinesignature) $setsharekey = true;
-							    if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
+							    if ($useonlinesignature) {
+							    	$setsharekey = true;
+							    }
+							    if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    	$setsharekey = true;
+							    }
 						    }
 						    if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
 							    $setsharekey = true;
@@ -4715,9 +5197,11 @@ 
 						    }
 
 						    if ($setsharekey) {
-							    if (empty($ecmfile->share))	// Because object not found or share not set yet
+							    if (empty($ecmfile->share)) {
+							    	// Because object not found or share not set yet
 							    {
 								    require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+							    }
 								    $ecmfile->share = getRandomPassword(true);
 							    }
 						    }
@@ -4758,7 +5242,9 @@ 
 
 						    // Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
 						    $update_main_doc_field = 0;
-						    if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;
+						    if (!empty($obj->update_main_doc_field)) {
+						    	$update_main_doc_field = 1;
+						    }
 						    if ($update_main_doc_field && !empty($this->table_element))
 						    {
 							    $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath.'/'.$ecmfile->filename)."'";
@@ -4795,7 +5281,9 @@ 
 		    	}
 			    return -1;
 		    }
-		} else return $reshook;
+		} else {
+			return $reshook;
+		}
 	}
 
 	/**
@@ -4846,13 +5334,21 @@ 
 		global $conf, $_POST;
 
 		// If param here has been posted, we use this value first.
-		if (GETPOSTISSET($fieldname)) return GETPOST($fieldname, 'alphanohtml', 3);
+		if (GETPOSTISSET($fieldname)) {
+			return GETPOST($fieldname, 'alphanohtml', 3);
+		}
 
-		if (isset($alternatevalue)) return $alternatevalue;
+		if (isset($alternatevalue)) {
+			return $alternatevalue;
+		}
 
 		$newelement = $this->element;
-		if ($newelement == 'facture') $newelement = 'invoice';
-		if ($newelement == 'commande') $newelement = 'order';
+		if ($newelement == 'facture') {
+			$newelement = 'invoice';
+		}
+		if ($newelement == 'commande') {
+			$newelement = 'order';
+		}
 		if (empty($newelement))
 		{
 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
@@ -4861,7 +5357,9 @@ 
 
 		$keyforfieldname = strtoupper($newelement.'_DEFAULT_'.$fieldname);
 		//var_dump($keyforfieldname);
-		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
+		if (isset($conf->global->$keyforfieldname)) {
+			return $conf->global->$keyforfieldname;
+		}
 
 		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
 	}
@@ -4934,7 +5432,10 @@ 
 		$this->array_languages = array();
 
 		$element = $this->element;
-		if ($element == 'categorie') $element = 'categories'; // For compatibility
+		if ($element == 'categorie') {
+			$element = 'categories';
+		}
+		// For compatibility
 
 		// Request to get translation values for object
 		$sql = "SELECT rowid, property, lang , value";
@@ -4971,8 +5472,11 @@ 
 
 			$this->db->free($resql);
 
-			if ($numrows) return $numrows;
-			else return 0;
+			if ($numrows) {
+				return $numrows;
+			} else {
+				return 0;
+			}
 		} else {
 			dol_print_error($this->db);
 			return -1;
@@ -4992,15 +5496,21 @@ 
 		// Get extra fields
 		foreach ($_POST as $postfieldkey => $postfieldvalue) {
 			$tmparray = explode('-', $postfieldkey);
-			if ($tmparray[0] != 'field') continue;
+			if ($tmparray[0] != 'field') {
+				continue;
+			}
 
 			$element = $tmparray[1];
 			$key = $tmparray[2];
 			$codelang = $tmparray[3];
 			//var_dump("postfieldkey=".$postfieldkey." element=".$element." key=".$key." codelang=".$codelang);
 
-			if (!empty($onlykey) && $key != $onlykey) continue;
-			if ($element != $this->element) continue;
+			if (!empty($onlykey) && $key != $onlykey) {
+				continue;
+			}
+			if ($element != $this->element) {
+				continue;
+			}
 
 			$key_type = $this->fields[$key]['type'];
 
@@ -5014,7 +5524,9 @@ 
 			{
 				$perms = dol_eval($this->fields[$key]['perms'], 1);
 			}*/
-			if (empty($enabled)) continue;
+			if (empty($enabled)) {
+				continue;
+			}
 			//if (empty($perms)) continue;
 
 			if (in_array($key_type, array('date')))
@@ -5041,7 +5553,9 @@ 
 				$value_key = price2num($value_arr);
 			} else {
 				$value_key = GETPOST($postfieldkey);
-				if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
+				if (in_array($key_type, array('link')) && $value_key == '-1') {
+					$value_key = '';
+				}
 			}
 
 			$this->array_languages[$key][$codelang] = $value_key;
@@ -5094,8 +5608,12 @@ 
 		// phpcs:enable
 		global $conf, $extrafields;
 
-		if (empty($rowid)) $rowid = $this->id;
-		if (empty($rowid)) $rowid = $this->rowid;
+		if (empty($rowid)) {
+			$rowid = $this->id;
+		}
+		if (empty($rowid)) {
+			$rowid = $this->rowid;
+		}
 
 		// To avoid SQL errors. Probably not the better solution though
 		if (!$this->table_element) {
@@ -5125,7 +5643,10 @@ 
 		}
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+			$table_element = 'categories';
+		}
+		// For compatibility
 
 		// Request to get complementary values
 		if (is_array($optionsArray) && count($optionsArray) > 0)
@@ -5182,8 +5703,11 @@ 
 
 				$this->db->free($resql);
 
-				if ($numrows) return $numrows;
-				else return 0;
+				if ($numrows) {
+					return $numrows;
+				} else {
+					return 0;
+				}
 			} else {
 				dol_print_error($this->db);
 				return -1;
@@ -5202,12 +5726,17 @@ 
 	{
 		global $conf;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			return 0;
+		}
 
 		$this->db->begin();
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+			$table_element = 'categories';
+		}
+		// For compatibility
 
 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
@@ -5237,9 +5766,13 @@ 
 	{
 		global $conf, $langs, $user;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			return 0;
+		}
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
@@ -5254,10 +5787,13 @@ 
 			//Eliminate copied source object extra_fields that do not exist in target object
 			$new_array_options = array();
 			foreach ($this->array_options as $key => $value) {
-				if (in_array(substr($key, 8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
+				if (in_array(substr($key, 8), array_keys($target_extrafields))) {
+					// We remove the 'options_' from $key for test
 					$new_array_options[$key] = $value;
-				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix
+				} elseif (in_array($key, array_keys($target_extrafields))) {
+					// We test on $key that does not contains the 'options_' prefix
 					$new_array_options['options_'.$key] = $value;
+				}
 			}
 
 			foreach ($new_array_options as $key => $value)
@@ -5272,8 +5808,12 @@ 
 			   	if ($attributeRequired)
 			   	{
 			   		$mandatorypb = false;
-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;
-			   		if ($this->array_options[$key] === '') $mandatorypb = true;
+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') {
+			   			$mandatorypb = true;
+			   		}
+			   		if ($this->array_options[$key] === '') {
+			   			$mandatorypb = true;
+			   		}
 			   		if ($mandatorypb)
 			   		{
 			   		    dol_syslog("Mandatory extra field ".$key." is empty");
@@ -5341,12 +5881,15 @@ 
 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
 			   					//var_dump($action);
 			   					//var_dump($this->oldcopy);exit;
-			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
+			   					if (is_object($this->oldcopy)) {
+			   						// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
 			   					{
 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
-				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
+				   						$new_array_options[$key] = $this->array_options[$key];
+			   					}
+			   					// Value is kept
 				   					} else {
 										// var_dump($algo);
 										$newvalue = dol_hash($this->array_options[$key], $algo);
@@ -5380,17 +5923,23 @@ 
 						dol_include_once($InfoFieldList[1]);
 						if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
 						{
-							if ($value == '-1')	// -1 is key for no defined in combo list of objects
+							if ($value == '-1') {
+								// -1 is key for no defined in combo list of objects
 							{
 								$new_array_options[$key] = '';
+							}
 							} elseif ($value)
 							{
 								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res = $object->fetch($value);
-								else $res = $object->fetch('', $value);
+								if (is_numeric($value)) {
+									$res = $object->fetch($value);
+								} else {
+									$res = $object->fetch('', $value);
+								}
 
-								if ($res > 0) $new_array_options[$key] = $object->id;
-								else {
+								if ($res > 0) {
+									$new_array_options[$key] = $object->id;
+								} else {
 									$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
@@ -5406,7 +5955,10 @@ 
 			$this->db->begin();
 
 			$table_element = $this->table_element;
-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+			if ($table_element == 'categorie') {
+				$table_element = 'categories';
+			}
+			// For compatibility
 
 			dol_syslog(get_class($this)."::insertExtraFields delete then insert", LOG_DEBUG);
 
@@ -5418,18 +5970,22 @@ 
 			{
 				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribut
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+					// Only for other type than separator
 					$sql .= ",".$attributeKey;
+				}
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
 			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
 			{
     			foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
     			{
-    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {
+    			    	// If field not already added previously
     			    {
     			        $sql .= ",".$tmpkey;
     			    }
+    			    }
     			}
 			}
 			$sql .= ") VALUES (".$this->id;
@@ -5438,11 +5994,13 @@ 
 			{
 				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribute
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+					// Only for other type than separator)
 				{
 					if ($new_array_options[$key] != '' || $new_array_options[$key] == '0')
 					{
 						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
+				}
 					} else {
 						$sql .= ",null";
 					}
@@ -5453,10 +6011,13 @@ 
 			{
 			    foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
     			{
-    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {
+    			    	// If field not already added previously
     			    {
                         if (in_array($tmpval, array('int', 'double'))) $sql .= ", 0";
-                        else $sql .= ", ''";
+    			    } else {
+                        	$sql .= ", ''";
+                        }
     			    }
     			}
 			}
@@ -5476,7 +6037,9 @@ 
 				// Call trigger
 				$this->context = array('extrafieldaddupdate'=>1);
 				$result = $this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 
@@ -5488,7 +6051,9 @@ 
 				$this->db->commit();
 				return 1;
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -5505,11 +6070,16 @@ 
 	{
 		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
-		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) return 0; // For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) {
+			return 0;
+		}
+		// For avoid conflicts if trigger used
 
 		if (is_array($this->array_languages))
 		{
@@ -5562,7 +6132,10 @@ 
 			$this->db->begin();
 
 			$table_element = $this->table_element;
-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+			if ($table_element == 'categorie') {
+				$table_element = 'categories';
+			}
+			// For compatibility
 
 			dol_syslog(get_class($this)."::insertExtraLanguages delete then insert", LOG_DEBUG);
 
@@ -5594,7 +6167,9 @@ 
 				// Call trigger
 				$this->context = array('extralanguagesaddupdate'=>1);
 				$result = $this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 
@@ -5606,7 +6181,9 @@ 
 				$this->db->commit();
 				return 1;
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -5623,9 +6200,13 @@ 
 	{
 		global $conf, $langs, $user;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			return 0;
+		}
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
@@ -5718,7 +6299,9 @@ 
 				// Call trigger
 				$this->context = array('extrafieldupdate'=>1);
 				$result = $this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 
@@ -5731,7 +6314,9 @@ 
 				$this->db->commit();
 				return 1;
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -5748,11 +6333,16 @@ 
 	{
 		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
-		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) return 0; // For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) {
+			return 0;
+		}
+		// For avoid conflicts if trigger used
 
 		return 0;
 	}
@@ -5836,8 +6426,11 @@ 
 
 		if ($computed)
 		{
-			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
+			if (!preg_match('/^search_/', $keyprefix)) {
+				return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+				return '';
+			}
 		}
 
 		// Set value of $morecss. For this, we use in priority showsize from parameters, then $val['css'] then autodefine
@@ -5849,9 +6442,11 @@ 
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			} elseif ($type == 'datetime' || $type == 'link')	// link means an foreign key to another primary id
+			} elseif ($type == 'datetime' || $type == 'link') {
+				// link means an foreign key to another primary id
 			{
 				$morecss = 'minwidth200imp';
+			}
 			} elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 			{
 				$morecss = 'maxwidth75';
@@ -5881,7 +6476,9 @@ 
 			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
+			if (!$required && $value == '') {
+				$value = '-1';
+			}
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
@@ -5904,9 +6501,11 @@ 
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		} elseif ($type == 'text')
 		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix)) {
+				// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			} else {
@@ -5914,9 +6513,11 @@ 
 			}
 		} elseif ($type == 'html')
 		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix)) {
+				// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			} else {
@@ -5953,10 +6554,14 @@ 
 			}
 
 			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-                if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1))$out .= '<option value="0">&nbsp;</option>';
+                if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1)) {
+                	$out .= '<option value="0">&nbsp;</option>';
+                }
 			foreach ($param['options'] as $key => $val)
 			{
-				if ((string) $key == '') continue;
+				if ((string) $key == '') {
+					continue;
+				}
 				list($val, $parent) = explode('|', $val);
 				$out .= '<option value="'.$key.'"';
 				$out .= (((string) $value == (string) $key) ? ' selected' : '');
@@ -6096,7 +6701,9 @@ 
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+							if (empty($labeltoshow)) {
+								$labeltoshow = '(not defined)';
+							}
 							if ($value == $obj->rowid)
 							{
 								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
@@ -6290,11 +6897,16 @@ 
 			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, empty($val['disabled']) ? 0 : 1);
 
 			if (!empty($param_list_array[2])) {		// If the entry into $fields is set to add a create button
-				if (!GETPOSTISSET('backtopage') && empty($val['disabled']) && empty($nonewbutton))	// To avoid to open several times the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
+				if (!GETPOSTISSET('backtopage') && empty($val['disabled']) && empty($nonewbutton)) {
+					// To avoid to open several times the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
 				{
 		   			list($class, $classfile) = explode(':', $param_list[0]);
-		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
-		   			else $url_path = dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
+				}
+		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) {
+		   				$url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
+		   			} else {
+		   				$url_path = dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
+		   			}
 		   			$paramforthenewlink = '';
 		   			$paramforthenewlink .= (GETPOSTISSET('action') ? '&action='.GETPOST('action', 'aZ09') : '');
 		   			$paramforthenewlink .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '');
@@ -6386,9 +6998,16 @@ 
 		{
 			$type = 'varchar'; // convert varchar(xx) int varchar
 			$size = $reg[1];
-		} elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
-		if (is_array($val['arrayofkeyval'])) $type = 'select';
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
+		} elseif (preg_match('/varchar/', $type)) {
+			$type = 'varchar';
+		}
+		// convert varchar(xx) int varchar
+		if (is_array($val['arrayofkeyval'])) {
+			$type = 'select';
+		}
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+			$type = 'link';
+		}
 
 		$default = $val['default'];
 		$computed = $val['computed'];
@@ -6397,7 +7016,9 @@ 
 		$param = array();
 		$param['options'] = array();
 
-		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
+		if (is_array($val['arrayofkeyval'])) {
+			$param['options'] = $val['arrayofkeyval'];
+		}
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
 		{
 			$type = 'link';
@@ -6412,7 +7033,9 @@ 
 		$help = $val['help'];
 		$hidden = (($val['visible'] == 0) ? 1 : 0); // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
-		if ($hidden) return '';
+		if ($hidden) {
+			return '';
+		}
 
 		// If field is a computed field, value must become result of compute
 		if ($computed)
@@ -6453,9 +7076,11 @@ 
 		}
 
 		// Format output value differently according to properties of field
-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value = $this->getNomUrl(1, '', 0, '', 1);
-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value = $this->getLibStatut(3);
-		elseif ($type == 'date')
+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) {
+			$value = $this->getNomUrl(1, '', 0, '', 1);
+		} elseif ($key == 'status' && method_exists($this, 'getLibStatut')) {
+			$value = $this->getLibStatut(3);
+		} elseif ($type == 'date')
 		{
 			if (!empty($value)) {
 				$value = dol_print_date($value, 'day');
@@ -6576,7 +7201,9 @@ 
 						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
-			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+			} else {
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+			}
 		} elseif ($type == 'radio')
 		{
 			$value = $param['options'][$value];
@@ -6685,7 +7312,9 @@ 
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
-			} else $value = '';
+			} else {
+				$value = '';
+			}
 		} elseif ($type == 'text' || $type == 'html')
 		{
 			$value = dol_htmlentitiesbr($value);
@@ -6720,7 +7349,9 @@ 
 	{
 		global $db, $conf, $langs, $action, $form, $hookmanager;
 
-		if (!is_object($form)) $form = new Form($db);
+		if (!is_object($form)) {
+			$form = new Form($db);
+		}
 
 		$out = '';
 
@@ -6739,7 +7370,9 @@ 
 				foreach ($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
 				{
 					// Show only the key field in params
-					if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
+					if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) {
+						continue;
+					}
 
 					// @todo Add test also on 'enabled' (different than 'list' that is 'visibility')
 					$enabled = 1;
@@ -6747,7 +7380,9 @@ 
 					{
 	                    $enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1);
 	                }
-					if (empty($enabled)) continue;
+					if (empty($enabled)) {
+						continue;
+					}
 
 					$visibility = 1;
 					if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key]))
@@ -6761,10 +7396,20 @@ 
 						$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
 					}
 
-					if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-					elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation
-					elseif ($mode == 'view' && empty($visibility)) continue;
-					if (empty($perms)) continue;
+					if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) {
+						continue;
+					}
+					// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+					elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) {
+						continue;
+					}
+					// <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation
+					elseif ($mode == 'view' && empty($visibility)) {
+						continue;
+					}
+					if (empty($perms)) {
+						continue;
+					}
 					// Load language if required
 					if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
 						$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
@@ -6851,10 +7496,12 @@ 
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
 						{
 							$datenotinstring = $this->array_options['options_'.$key];
-							if (!is_numeric($this->array_options['options_'.$key]))	// For backward compatibility
+							if (!is_numeric($this->array_options['options_'.$key])) {
+								// For backward compatibility
 							{
 								$datenotinstring = $this->db->jdate($datenotinstring);
 							}
+							}
 							$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
 						}
 						// Convert float submited string into real php numeric (value in memory must be a php numeric)
@@ -6865,8 +7512,11 @@ 
 						// HTML, select, integer and text add default value
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'select', 'int')))
 						{
-							if ($action == 'create') $value = $extrafields->attributes[$this->table_element]['default'][$key];
-							else $value = $this->array_options['options_'.$key];
+							if ($action == 'create') {
+								$value = $extrafields->attributes[$this->table_element]['default'][$key];
+							} else {
+								$value = $this->array_options['options_'.$key];
+							}
 						}
 
 						$labeltoshow = $langs->trans($label);
@@ -6880,14 +7530,24 @@ 
 						$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";
 						if ($tpl_context == "public") {	// Public page : red dot instead of fieldrequired characters
 							$out .= '">';
-							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
-							else $out .= $labeltoshow;
-							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';
+							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) {
+								$out .= $form->textwithpicto($labeltoshow, $helptoshow);
+							} else {
+								$out .= $labeltoshow;
+							}
+							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+								$out .= '&nbsp;<font color="red">*</font>';
+							}
 						} else {
-							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+								$out .= ' fieldrequired';
+							}
 							$out .= '">';
-							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
-							else $out .= $labeltoshow;
+							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) {
+								$out .= $form->textwithpicto($labeltoshow, $helptoshow);
+							} else {
+								$out .= $labeltoshow;
+							}
 						}
 						$out .= '</td>';
 
@@ -6912,8 +7572,11 @@ 
 							$out .='<td class="'.$this->element.'_extras_'.$key.'"></td>';
 						}*/
 
-						if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
-						else $out .= '</tr>';
+						if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+							$out .= '</tr>';
+						} else {
+							$out .= '</tr>';
+						}
 						$e++;
 					}
 				}
@@ -6970,7 +7633,9 @@ 
 		global $user;
 
 		$element = $this->element;
-		if ($element == 'facturerec') $element = 'facture';
+		if ($element == 'facturerec') {
+			$element = 'facture';
+		}
 
 		return $user->rights->{$element};
 	}
@@ -6995,7 +7660,10 @@ 
 
 			if (!$db->query($sql))
 			{
-				if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+				if ($ignoreerrors) {
+					return true;
+				}
+				// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
 				//$this->errors = $db->lasterror();
 				return false;
 			}
@@ -7022,9 +7690,11 @@ 
 
 		$buyPrice = 0;
 
-		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
+		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
+			// In most cases, test here is false
 		{
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
+		}
 		} else {
 			// Get cost price for margin calculation
 			if (!empty($fk_product))
@@ -7171,18 +7841,26 @@ 
 					if ($size == 1 || $size == 'small') {   // Format vignette
 						// Find name of thumb file
 						$photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));
-						if (!dol_is_file($dirthumb.$photo_vignette)) $photo_vignette = '';
+						if (!dol_is_file($dirthumb.$photo_vignette)) {
+							$photo_vignette = '';
+						}
 
 						// Get filesize of original file
 						$imgarray = dol_getImageSize($dir.$photo);
 
 						if ($nbbyrow > 0)
 						{
-							if ($nbphoto == 1) $return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2px; border-spacing: 2px; border-collapse: separate;">';
+							if ($nbphoto == 1) {
+								$return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2px; border-spacing: 2px; border-collapse: separate;">';
+							}
 
-							if ($nbphoto % $nbbyrow == 1) $return .= '<tr class="center valignmiddle" style="border: 1px">';
+							if ($nbphoto % $nbbyrow == 1) {
+								$return .= '<tr class="center valignmiddle" style="border: 1px">';
+							}
 							$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%" class="photo">';
-						} elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
+						} elseif ($nbbyrow < 0) {
+							$return .= '<div class="inline-block">';
+						}
 
 						$return .= "\n";
 
@@ -7190,15 +7868,20 @@ 
 						if (empty($nolink))
 						{
 							$urladvanced = getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
-							if ($urladvanced) $return .= '<a href="'.$urladvanced.'">';
-							else $return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							if ($urladvanced) {
+								$return .= '<a href="'.$urladvanced.'">';
+							} else {
+								$return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							}
 						}
 
 						// Show image (width height=$maxHeight)
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
 						$alt = $langs->transnoentitiesnoconv('File').': '.$relativefile;
 						$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-						if ($notitle) $alt = '';
+						if ($notitle) {
+							$alt = '';
+						}
 
 						if ($usesharelink)
 						{
@@ -7227,10 +7910,14 @@ 
 							}
 						}
 
-						if (empty($nolink)) $return .= '</a>';
+						if (empty($nolink)) {
+							$return .= '</a>';
+						}
 						$return .= "\n";
 
-						if ($showfilename) $return .= '<br>'.$viewfilename;
+						if ($showfilename) {
+							$return .= '<br>'.$viewfilename;
+						}
 						if ($showaction)
 						{
 							$return .= '<br>';
@@ -7255,14 +7942,20 @@ 
 						if ($nbbyrow > 0)
 						{
 							$return .= '</td>';
-							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';
-						} elseif ($nbbyrow < 0) $return .= '</div>';
+							if (($nbphoto % $nbbyrow) == 0) {
+								$return .= '</tr>';
+							}
+						} elseif ($nbbyrow < 0) {
+							$return .= '</div>';
+						}
 					}
 
 					if (empty($size)) {     // Format origine
 						$return .= '<img class="photo photowithmargin" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
-						if ($showfilename) $return .= '<br>'.$viewfilename;
+						if ($showfilename) {
+							$return .= '<br>'.$viewfilename;
+						}
 						if ($showaction)
 						{
 							// Special case for product
@@ -7279,7 +7972,9 @@ 
 					}
 
 					// On continue ou on arrete de boucler ?
-					if ($nbmax && $nbphoto >= $nbmax) break;
+					if ($nbmax && $nbphoto >= $nbmax) {
+						break;
+					}
 				}
 			}
 
@@ -7294,7 +7989,9 @@ 
 						$nbphoto++;
 					}
 
-					if ($nbphoto) $return .= '</table>';
+					if ($nbphoto) {
+						$return .= '</table>';
+					}
 				}
 			}
 		}
@@ -7315,8 +8012,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && $info['type'] == 'array') return true;
-			else return false;
+			if (isset($info['type']) && $info['type'] == 'array') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7329,7 +8029,9 @@ 
 	 */
 	public function isDate($info)
 	{
-		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) return true;
+		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) {
+			return true;
+		}
 		return false;
 	}
 
@@ -7343,9 +8045,14 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && ($info['type'] == 'duration')) return true;
-			else return false;
-		} else return false;
+			if (isset($info['type']) && ($info['type'] == 'duration')) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -7358,9 +8065,14 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;
-			else return false;
-		} else return false;
+			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -7373,8 +8085,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && (preg_match('/^(double|real|price)/i', $info['type']))) return true;
-			else return false;
+			if (isset($info['type']) && (preg_match('/^(double|real|price)/i', $info['type']))) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7389,8 +8104,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && $info['type'] == 'text') return true;
-			else return false;
+			if (isset($info['type']) && $info['type'] == 'text') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7405,8 +8123,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['notnull']) && $info['notnull'] != '1') return true;
-			else return false;
+			if (isset($info['notnull']) && $info['notnull'] != '1') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -7421,8 +8142,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['notnull']) && $info['notnull'] == '-1') return true;
-			else return false;
+			if (isset($info['notnull']) && $info['notnull'] == '-1') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7437,8 +8161,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['index']) && $info['index'] == true) return true;
-			else return false;
+			if (isset($info['index']) && $info['index'] == true) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7456,7 +8183,8 @@ 
 		global $conf;
 
 		$queryarray = array();
-		foreach ($this->fields as $field => $info)	// Loop on definition of fields
+		foreach ($this->fields as $field => $info) {
+			// Loop on definition of fields
 		{
 			// Depending on field type ('datetime', ...)
 			if ($this->isDate($info))
@@ -7464,6 +8192,7 @@ 
 				if (empty($this->{$field}))
 				{
 					$queryarray[$field] = null;
+		}
 				} else {
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
@@ -7480,24 +8209,43 @@ 
 			} elseif ($this->isDuration($info))
 			{
 				// $this->{$field} may be null, '', 0, '0', 123, '123'
-				if ($this->{$field} != '' || !empty($info['notnull'])) $queryarray[$field] = (int) $this->{$field};		// If '0', it may be set to null later if $info['notnull'] == -1
-				else $queryarray[$field] = null;
+				if ($this->{$field} != '' || !empty($info['notnull'])) {
+					$queryarray[$field] = (int) $this->{$field};
+				}
+				// If '0', it may be set to null later if $info['notnull'] == -1
+				else {
+					$queryarray[$field] = null;
+				}
 			} elseif ($this->isInt($info) || $this->isFloat($info))
 			{
-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
-				else {
+				if ($field == 'entity' && is_null($this->{$field})) {
+					$queryarray[$field] = $conf->entity;
+				} else {
 					// $this->{$field} may be null, '', 0, '0', 123, '123'
 					if ($this->{$field} != '' || !empty($info['notnull'])) {
-						if ($this->isInt($info)) $queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
-						if ($this->isFloat($info)) $queryarray[$field] = (double) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
-					} else $queryarray[$field] = null;
+						if ($this->isInt($info)) {
+							$queryarray[$field] = (int) $this->{$field};
+						}
+						// If '0', it may be set to null later if $info['notnull'] == -1
+						if ($this->isFloat($info)) {
+							$queryarray[$field] = (double) $this->{$field};
+						}
+						// If '0', it may be set to null later if $info['notnull'] == -1
+					} else {
+						$queryarray[$field] = null;
+					}
 				}
 			} else {
 				$queryarray[$field] = $this->{$field};
 			}
 
-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null; // May force 0 to null
+			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) {
+				unset($queryarray[$field]);
+			}
+			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) {
+				$queryarray[$field] = null;
+			}
+			// May force 0 to null
 		}
 
 		return $queryarray;
@@ -7515,25 +8263,34 @@ 
 		{
 			if ($this->isDate($info))
 			{
-				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
-				else $this->{$field} = strtotime($obj->{$field});
+				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') {
+					$this->{$field} = 0;
+				} else {
+					$this->{$field} = strtotime($obj->{$field});
+				}
 			} elseif ($this->isArray($info))
 			{
 				if (!empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
 					// Hack for data not in UTF8
-					if ($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
+					if ($this->{$field } === false) {
+						@unserialize(utf8_decode($obj->{$field}));
+					}
 				} else {
 					$this->{$field} = array();
 				}
 			} elseif ($this->isInt($info))
 			{
-				if ($field == 'rowid') $this->id = (int) $obj->{$field};
-				else {
+				if ($field == 'rowid') {
+					$this->id = (int) $obj->{$field};
+				} else {
 					if ($this->isForcedToNullIfZero($info))
 					{
-						if (empty($obj->{$field})) $this->{$field} = null;
-						else $this->{$field} = (double) $obj->{$field};
+						if (empty($obj->{$field})) {
+							$this->{$field} = null;
+						} else {
+							$this->{$field} = (double) $obj->{$field};
+						}
 					} else {
 						if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 							$this->{$field} = (int) $obj->{$field};
@@ -7546,8 +8303,11 @@ 
 			{
 				if ($this->isForcedToNullIfZero($info))
 				{
-					if (empty($obj->{$field})) $this->{$field} = null;
-					else $this->{$field} = (double) $obj->{$field};
+					if (empty($obj->{$field})) {
+						$this->{$field} = null;
+					} else {
+						$this->{$field} = (double) $obj->{$field};
+					}
 				} else {
 					if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 						$this->{$field} = (double) $obj->{$field};
@@ -7561,7 +8321,9 @@ 
 		}
 
 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
-		if (!isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
+		if (!isset($this->fields['ref']) && isset($this->id)) {
+			$this->ref = $this->id;
+		}
 	}
 
 	/**
@@ -7584,13 +8346,19 @@ 
 	 */
 	protected function quote($value, $fieldsentry)
 	{
-		if (is_null($value)) return 'NULL';
-		elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) return $this->db->escape("$value");
-		elseif ($fieldsentry['type'] == 'boolean') {
-		    if ($value) return 'true';
-		    else return 'false';
-        }
-		else return "'".$this->db->escape($value)."'";
+		if (is_null($value)) {
+			return 'NULL';
+		} elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) {
+			return $this->db->escape("$value");
+		} elseif ($fieldsentry['type'] == 'boolean') {
+		    if ($value) {
+		    	return 'true';
+		    } else {
+		    	return 'false';
+		    }
+        } else {
+			return "'".$this->db->escape($value)."'";
+		}
 	}
 
 
@@ -7612,10 +8380,17 @@ 
 
 		$fieldvalues = $this->setSaveQuery();
 
-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation'] = $this->db->idate($now);
-		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat'] = $user->id;
+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) {
+			$fieldvalues['date_creation'] = $this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) {
+			$fieldvalues['fk_user_creat'] = $user->id;
+		}
 		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
-		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
+		if (array_key_exists('ref', $fieldvalues)) {
+			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']);
+		}
+		// If field is a ref, we sanitize data
 
 		$keys = array();
 		$values = array();
@@ -7629,8 +8404,12 @@ 
 		foreach ($keys as $key)
 		{
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';
-			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+				$values[$key] = '';
+			}
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+				$values[$key] = '';
+			}
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && !isset($values[$key]) && is_null($this->fields[$key]['default']))
@@ -7641,13 +8420,20 @@ 
 
 			// If field is an implicit foreign key field
 			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) {
-				if (isset($this->fields[$key]['default'])) $values[$key] = $this->fields[$key]['default'];
-				else $values[$key] = 'null';
+				if (isset($this->fields[$key]['default'])) {
+					$values[$key] = $this->fields[$key]['default'];
+				} else {
+					$values[$key] = 'null';
+				}
+			}
+			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) {
+				$values[$key] = 'null';
 			}
-			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key] = 'null';
 		}
 
-		if ($error) return -1;
+		if ($error) {
+			return -1;
+		}
 
 		$this->db->begin();
 
@@ -7691,7 +8477,9 @@ 
 		if (!$error)
 		{
 			$result = $this->insertExtraFields();
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 		}
 
 		// Create lines
@@ -7707,7 +8495,9 @@ 
 
 				// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-				if (!is_object($line)) $line = (object) $line;
+				if (!is_object($line)) {
+					$line = (object) $line;
+				}
 
 				$result = $line->create($user, 1);
 				if ($result < 0)
@@ -7749,19 +8539,32 @@ 
 	 */
 	public function fetchCommon($id, $ref = null, $morewhere = '')
 	{
-		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
+		if (empty($id) && empty($ref) && empty($morewhere)) {
+			return -1;
+		}
 
 		$fieldlist = $this->getFieldList();
-		if (empty($fieldlist)) return 0;
+		if (empty($fieldlist)) {
+			return 0;
+		}
 
 		$sql = 'SELECT '.$fieldlist;
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-		if (!empty($id))  $sql .= ' WHERE rowid = '.$id;
-		elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
-		else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
-		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' AND entity IN ('.getEntity($this->table_element).')';
-		if ($morewhere)   $sql .= $morewhere;
+		if (!empty($id)) {
+			$sql .= ' WHERE rowid = '.$id;
+		} elseif (!empty($ref)) {
+			$sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		} else {
+			$sql .= ' WHERE 1 = 1';
+		}
+		// usage with empty id and empty ref is very rare
+		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= ' AND entity IN ('.getEntity($this->table_element).')';
+		}
+		if ($morewhere) {
+			$sql .= $morewhere;
+		}
 		$sql .= ' LIMIT 1'; // This is a fetch, to be sure to get only one record
 
 		$res = $this->db->query($sql);
@@ -7807,7 +8610,9 @@ 
 		$sql = 'SELECT '.$objectline->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;
 		$sql .= ' WHERE fk_'.$this->element.' = '.$this->id;
-		if ($morewhere)   $sql .= $morewhere;
+		if ($morewhere) {
+			$sql .= $morewhere;
+		}
 		if (isset($objectline->fields['position'])) {
 			$sql .= $this->db->order('position', 'ASC');
 		}
@@ -7856,10 +8661,17 @@ 
 
 		$fieldvalues = $this->setSaveQuery();
 
-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification'] = $this->db->idate($now);
-		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif'] = $user->id;
+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {
+			$fieldvalues['date_modification'] = $this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) {
+			$fieldvalues['fk_user_modif'] = $user->id;
+		}
 		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
-		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
+		if (array_key_exists('ref', $fieldvalues)) {
+			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']);
+		}
+		// If field is a ref, we sanitize data
 
 		$keys = array();
 		$values = array();
@@ -7874,8 +8686,14 @@ 
 		// Clean and check mandatory
 		foreach ($keys as $key)
 		{
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = ''; // This is an implicit foreign key field
-			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = ''; // This is an explicit foreign key field
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+				$values[$key] = '';
+			}
+			// This is an implicit foreign key field
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+				$values[$key] = '';
+			}
+			// This is an explicit foreign key field
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			/*
@@ -7944,11 +8762,13 @@ 
 
 		$this->db->begin();
 
-		if ($forcechilddeletion)	// Force also delete of childtables that should lock deletion in standard case when option force is off
+		if ($forcechilddeletion) {
+			// Force also delete of childtables that should lock deletion in standard case when option force is off
 		{
 			foreach ($this->childtables as $table)
 			{
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
+		}
 				$resql = $this->db->query($sql);
 				if (!$resql)
 				{
@@ -7958,9 +8778,11 @@ 
 					return -1;
 				}
 			}
-		} elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+		} elseif (!empty($this->fk_element) && !empty($this->childtables)) {
+			// If object has childs linked with a foreign key field, we check all child tables.
 		{
 			$objectisused = $this->isObjectUsed($this->id);
+		}
 			if (!empty($objectisused))
 			{
 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
@@ -8129,7 +8951,9 @@ 
 
 		// Call trigger
 		$result = $this->call_trigger('LINE'.strtoupper($tmpforobjectclass).'_DELETE', $user);
-		if ($result < 0) return -1;
+		if ($result < 0) {
+			return -1;
+		}
 		// End call triggers
 
 		$this->db->begin();
@@ -8200,7 +9024,9 @@ 
 			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger($triggercode, $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			if (!$error) {
@@ -8230,14 +9056,30 @@ 
 	    global $user;
 
 		$this->id = 0;
-		if (array_key_exists('label', $this->fields)) $this->label = 'This is label';
-		if (array_key_exists('note_public', $this->fields)) $this->note_public = 'Public note';
-		if (array_key_exists('note_private', $this->fields)) $this->note_private = 'Private note';
-		if (array_key_exists('date_creation', $this->fields)) $this->date_creation = (dol_now() - 3600 * 24);
-		if (array_key_exists('date_modification', $this->fields)) $this->date_modification = (dol_now() - 3600 * 24);
-		if (array_key_exists('fk_user_creat', $this->fields)) $this->fk_user_creat = $user->id;
-		if (array_key_exists('fk_user_modif', $this->fields)) $this->fk_user_modif = $user->id;
-		if (array_key_exists('date', $this->fields)) $this->date = dol_now();
+		if (array_key_exists('label', $this->fields)) {
+			$this->label = 'This is label';
+		}
+		if (array_key_exists('note_public', $this->fields)) {
+			$this->note_public = 'Public note';
+		}
+		if (array_key_exists('note_private', $this->fields)) {
+			$this->note_private = 'Private note';
+		}
+		if (array_key_exists('date_creation', $this->fields)) {
+			$this->date_creation = (dol_now() - 3600 * 24);
+		}
+		if (array_key_exists('date_modification', $this->fields)) {
+			$this->date_modification = (dol_now() - 3600 * 24);
+		}
+		if (array_key_exists('fk_user_creat', $this->fields)) {
+			$this->fk_user_creat = $user->id;
+		}
+		if (array_key_exists('fk_user_modif', $this->fields)) {
+			$this->fk_user_modif = $user->id;
+		}
+		if (array_key_exists('date', $this->fields)) {
+			$this->date = dol_now();
+		}
 		// ...
 	}
 
@@ -8281,7 +9123,9 @@ 
      */
     public function trimParameters($parameters)
     {
-        if (!is_array($parameters)) return;
+        if (!is_array($parameters)) {
+        	return;
+        }
         foreach ($parameters as $parameter) {
             if (isset($this->$parameter)) {
                 $this->$parameter = trim($this->$parameter);
@@ -8382,7 +9226,9 @@ 
 	{
 		$this->db->begin();
 
-		if (empty($type)) $type = $this->table_element;
+		if (empty($type)) {
+			$type = $this->table_element;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categorystatic = new Categorie($this->db);

htdocs/core/class/html.form.class.php

Spacing +17 added lines, -17 removed lines

@@ -647,7 +647,7 @@ 
 
 		$disabled = 0;
 		$ret = '<div class="centpercent center">';
-                $ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'select valignmiddle alignstart" name="' . $name . '"'.($disabled ? ' disabled="disabled"' : '').'>';
+                $ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' '.$name.' '.$name.'select valignmiddle alignstart" name="'.$name.'"'.($disabled ? ' disabled="disabled"' : '').'>';
 
 		// Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
 		$parameters = array();
@@ -666,11 +666,11 @@ 
 
 		$ret .= '</select>';
 
-                if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.' . $name . 'select');
+                if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.'.$name.'select');
 
 		// Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
 		$ret .= '<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">'; // Hidden button BEFORE so it is the one used when we submit with ENTER.
-                $ret .= '<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
+                $ret .= '<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' '.$name.' '.$name.'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
 		$ret .= '</div>';
 
 		if (!empty($conf->use_javascript_ajax))
@@ -701,11 +701,11 @@ 
         		}
 
         	jQuery(document).ready(function () {
-                    initCheckForSelect(0, "' . $name . '", "' . $cssclass . '");
-                    jQuery(".' . $cssclass . '").click(function() {
-                        initCheckForSelect(1, "'.$name.'", "' . $cssclass . '");
+                    initCheckForSelect(0, "' . $name.'", "'.$cssclass.'");
+                    jQuery(".' . $cssclass.'").click(function() {
+                        initCheckForSelect(1, "'.$name.'", "'.$cssclass.'");
                     });
-                        jQuery(".' . $name . 'select").change(function() {
+                        jQuery(".' . $name.'select").change(function() {
         			var massaction = $( this ).val();
         			var urlform = $( this ).closest("form").attr("action").replace("#show_files","");
         			if (massaction == "builddoc")
@@ -717,14 +717,14 @@ 
         	        /* Warning: if you set submit button to disabled, post using Enter will no more work if there is no other button */
         			if ($(this).val() != \'0\')
     	  			{
-                                        jQuery(".' . $name . 'confirmed").prop(\'disabled\', false);
-										jQuery(".' . $name . 'other").hide();	/* To disable if another div was open */
-                                        jQuery(".' . $name . '"+massaction).show();
+                                        jQuery(".' . $name.'confirmed").prop(\'disabled\', false);
+										jQuery(".' . $name.'other").hide();	/* To disable if another div was open */
+                                        jQuery(".' . $name.'"+massaction).show();
     	  			}
     	  			else
     	  			{
-                                        jQuery(".' . $name . 'confirmed").prop(\'disabled\', true);
-										jQuery(".' . $name . 'other").hide();	/* To disable any div open */
+                                        jQuery(".' . $name.'confirmed").prop(\'disabled\', true);
+										jQuery(".' . $name.'other").hide();	/* To disable any div open */
     	  			}
     	        });
         	});
@@ -6500,7 +6500,7 @@ 
 
 		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
 
-		$tmpvar = "MAIN_SELECTEDFIELDS_".$varpage;	// To get list of saved seleteced properties
+		$tmpvar = "MAIN_SELECTEDFIELDS_".$varpage; // To get list of saved seleteced properties
 		if (!empty($user->conf->$tmpvar))
 		{
 			$tmparray = explode(',', $user->conf->$tmpvar);
@@ -7520,10 +7520,10 @@ 
 
 		$out = '';
 		$id = uniqid();
-                if (!empty($conf->use_javascript_ajax)) $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="' . $cssclass . 's" name="' . $cssclass . 's" class="checkallactions"></div>';
+                if (!empty($conf->use_javascript_ajax)) $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="'.$cssclass.'s" name="'.$cssclass.'s" class="checkallactions"></div>';
 		$out .= '<script>
             $(document).ready(function() {
-                $("#' . $cssclass . 's").click(function() {
+                $("#' . $cssclass.'s").click(function() {
                     if($(this).is(\':checked\')){
                         console.log("We check all '.$cssclass.'");
                 		$(".'.$cssclass.'").prop(\'checked\', true).trigger(\'change\');
@@ -7533,10 +7533,10 @@ 
                         console.log("We uncheck all");
                 		$(".'.$cssclass.'").prop(\'checked\', false).trigger(\'change\');
                     }'."\n";
-                if ($calljsfunction) $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0, "' . $massactionname . '", "' . $cssclass . '"); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+                if ($calljsfunction) $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0, "'.$massactionname.'", "'.$cssclass.'"); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
 		$out .= '         });
 
-                $(".' . $cssclass . '").change(function() {
+                $(".' . $cssclass.'").change(function() {
 				$(this).closest("tr").toggleClass("highlight", this.checked);
 			});
 

Braces +1472 added lines, -515 removed lines

@@ -116,40 +116,70 @@ 
 			{
 				$tmp = explode(':', $typeofdata);
 				$ret .= '<div class="editkey_'.$tmp[0].(!empty($tmp[1]) ? ' '.$tmp[1] : '').'" id="'.$htmlname.'">';
-				if ($fieldrequired) $ret .= '<span class="fieldrequired">';
+				if ($fieldrequired) {
+					$ret .= '<span class="fieldrequired">';
+				}
 				if ($help) {
 					$ret .= $this->textwithpicto($langs->trans($text), $help);
 				} else {
 					$ret .= $langs->trans($text);
 				}
-				if ($fieldrequired) $ret .= '</span>';
+				if ($fieldrequired) {
+					$ret .= '</span>';
+				}
 				$ret .= '</div>'."\n";
 			} else {
-				if ($fieldrequired) $ret .= '<span class="fieldrequired">';
+				if ($fieldrequired) {
+					$ret .= '<span class="fieldrequired">';
+				}
 				if ($help) {
 					$ret .= $this->textwithpicto($langs->trans($text), $help);
 				} else {
 					$ret .= $langs->trans($text);
 				}
-				if ($fieldrequired) $ret .= '</span>';
+				if ($fieldrequired) {
+					$ret .= '</span>';
+				}
 			}
 		} else {
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
-			if ($fieldrequired) $ret .= '<span class="fieldrequired">';
+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
+			}
+			if ($fieldrequired) {
+				$ret .= '<span class="fieldrequired">';
+			}
 			if ($help) {
 				$ret .= $this->textwithpicto($langs->trans($text), $help);
 			} else {
 				$ret .= $langs->trans($text);
 			}
-			if ($fieldrequired) $ret .= '</span>';
-			if (!empty($notabletag)) $ret .= ' ';
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '</td>';
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<td class="right">';
-			if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
-			if (!empty($notabletag) && $notabletag == 1) $ret .= ' : ';
-			if (!empty($notabletag) && $notabletag == 3) $ret .= ' ';
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '</td>';
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '</tr></table>';
+			if ($fieldrequired) {
+				$ret .= '</span>';
+			}
+			if (!empty($notabletag)) {
+				$ret .= ' ';
+			}
+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '</td>';
+			}
+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '<td class="right">';
+			}
+			if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
+			}
+			if (!empty($notabletag) && $notabletag == 1) {
+				$ret .= ' : ';
+			}
+			if (!empty($notabletag) && $notabletag == 3) {
+				$ret .= ' ';
+			}
+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '</td>';
+			}
+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+				$ret .= '</tr></table>';
+			}
 		}
 
 		return $ret;
@@ -180,12 +210,16 @@ 
 		$ret = '';
 
 		// Check parameters
-		if (empty($typeofdata)) return 'ErrorBadParameter';
+		if (empty($typeofdata)) {
+			return 'ErrorBadParameter';
+		}
 
 		// When option to edit inline is activated
-		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) // TODO add jquery timepicker and support select
+		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) {
+			// TODO add jquery timepicker and support select
 		{
 			$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
+		}
 		} else {
 			if (GETPOST('action', 'aZ09') == 'edit'.$htmlname)
 			{
@@ -194,8 +228,12 @@ 
 				$ret .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
 				$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$ret .= '<input type="hidden" name="'.$paramid.'" value="'.$object->id.'">';
-				if (empty($notabletag)) $ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';
-				if (empty($notabletag)) $ret .= '<tr><td>';
+				if (empty($notabletag)) {
+					$ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';
+				}
+				if (empty($notabletag)) {
+					$ret .= '<tr><td>';
+				}
 				if (preg_match('/^(string|safehtmlstring|email)/', $typeofdata))
 				{
 					$tmp = explode(':', $typeofdata);
@@ -205,9 +243,11 @@ 
 					$tmp = explode(':', $typeofdata);
 					$valuetoshow = price2num($editvalue ? $editvalue : $value);
 					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ?price($valuetoshow) : '').'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';
-				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))	// if wysiwyg is enabled $typeofdata = 'ckeditor'
+				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {
+					// if wysiwyg is enabled $typeofdata = 'ckeditor'
 				{
 					$tmp = explode(':', $typeofdata);
+				}
 					$cols = $tmp[2];
 					$morealt = '';
 					if (preg_match('/%/', $cols))
@@ -247,25 +287,41 @@ 
 					$doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), ($tmp[2] ? $tmp[2] : ''), ($tmp[3] ? $tmp[3] : '100'), ($tmp[1] ? $tmp[1] : 'dolibarr_notes'), 'In', ($tmp[5] ? $tmp[5] : 0), (isset($tmp[8]) ? ($tmp[8] ?true:false) : true), true, ($tmp[6] ? $tmp[6] : '20'), ($tmp[7] ? $tmp[7] : '100'));
 					$ret .= $doleditor->Create(1);
 				}
-				if (empty($notabletag)) $ret .= '</td>';
+				if (empty($notabletag)) {
+					$ret .= '</td>';
+				}
 
-				if (empty($notabletag)) $ret .= '<td class="left">';
+				if (empty($notabletag)) {
+					$ret .= '<td class="left">';
+				}
 				//else $ret.='<div class="clearboth"></div>';
 				$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="modify" value="'.$langs->trans("Modify").'">';
-				if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) $ret .= '<br>'."\n";
+				if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) {
+					$ret .= '<br>'."\n";
+				}
 				$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';
-				if (empty($notabletag)) $ret .= '</td>';
+				if (empty($notabletag)) {
+					$ret .= '</td>';
+				}
 
-				if (empty($notabletag)) $ret .= '</tr></table>'."\n";
+				if (empty($notabletag)) {
+					$ret .= '</tr></table>'."\n";
+				}
 				$ret .= '</form>'."\n";
 			} else {
-				if (preg_match('/^(email)/', $typeofdata))              $ret .= dol_print_email($value, 0, 0, 0, 0, 1);
-				elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
-				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))  $ret .= dol_htmlentitiesbr($value);
-				elseif (preg_match('/^safehtmlstring/', $typeofdata)) $ret .= dol_string_onlythesehtmltags($value);
-				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret .= dol_print_date($value, 'day');
-				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret .= dol_print_date($value, 'dayhour');
-				elseif (preg_match('/^select;/', $typeofdata))
+				if (preg_match('/^(email)/', $typeofdata)) {
+					$ret .= dol_print_email($value, 0, 0, 0, 0, 1);
+				} elseif (preg_match('/^(amount|numeric)/', $typeofdata)) {
+					$ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
+				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {
+					$ret .= dol_htmlentitiesbr($value);
+				} elseif (preg_match('/^safehtmlstring/', $typeofdata)) {
+					$ret .= dol_string_onlythesehtmltags($value);
+				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {
+					$ret .= dol_print_date($value, 'day');
+				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {
+					$ret .= dol_print_date($value, 'dayhour');
+				} elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
@@ -319,7 +375,9 @@ 
 
 		// List of extra languages
 		$arrayoflangcode = array();
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) $arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) {
+			$arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+		}
 
 		if (is_array($arrayoflangcode) && count($arrayoflangcode)) {
 			if (!is_object($extralanguages)) {
@@ -391,9 +449,13 @@ 
 		$out = '';
 
 		// Check parameters
-		if (preg_match('/^text/', $inputType)) $value = dol_nl2br($value);
-		elseif (preg_match('/^numeric/', $inputType)) $value = price($value);
-		elseif ($inputType == 'day' || $inputType == 'datepicker') $value = dol_print_date($value, 'day');
+		if (preg_match('/^text/', $inputType)) {
+			$value = dol_nl2br($value);
+		} elseif (preg_match('/^numeric/', $inputType)) {
+			$value = price($value);
+		} elseif ($inputType == 'day' || $inputType == 'datepicker') {
+			$value = dol_print_date($value, 'day');
+		}
 
 		if ($condition)
 		{
@@ -422,23 +484,35 @@ 
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
-				if (!empty($tmp[1])) $inputOption = $tmp[1];
-				if (!empty($tmp[2])) $savemethod = $tmp[2];
+				if (!empty($tmp[1])) {
+					$inputOption = $tmp[1];
+				}
+				if (!empty($tmp[2])) {
+					$savemethod = $tmp[2];
+				}
 				$out .= '<input id="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";
 			} elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
-				if (!empty($tmp[1])) $inputOption = $tmp[1];
-				if (!empty($tmp[2])) $savemethod = $tmp[2];
+				if (!empty($tmp[1])) {
+					$inputOption = $tmp[1];
+				}
+				if (!empty($tmp[2])) {
+					$savemethod = $tmp[2];
+				}
 
 				$out .= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format
 			} elseif (preg_match('/^(select|autocomplete)/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $loadmethod = $tmp[1];
-				if (!empty($tmp[2])) $savemethod = $tmp[2];
-				if (!empty($tmp[3])) $button_only = true;
+				if (!empty($tmp[2])) {
+					$savemethod = $tmp[2];
+				}
+				if (!empty($tmp[3])) {
+					$button_only = true;
+				}
 			} elseif (preg_match('/^textarea/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
@@ -449,9 +523,15 @@ 
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $toolbar = $tmp[1];
-				if (!empty($tmp[2])) $width = $tmp[2];
-				if (!empty($tmp[3])) $heigth = $tmp[3];
-				if (!empty($tmp[4])) $savemethod = $tmp[4];
+				if (!empty($tmp[2])) {
+					$width = $tmp[2];
+				}
+				if (!empty($tmp[3])) {
+					$heigth = $tmp[3];
+				}
+				if (!empty($tmp[4])) {
+					$savemethod = $tmp[4];
+				}
 
 				if (!empty($conf->fckeditor->enabled))
 				{
@@ -465,17 +545,25 @@ 
 			$out .= '<input id="table_element_'.$htmlname.'" value="'.$table_element.'" type="hidden"/>'."\n";
 			$out .= '<input id="fk_element_'.$htmlname.'" value="'.$fk_element.'" type="hidden"/>'."\n";
 			$out .= '<input id="loadmethod_'.$htmlname.'" value="'.$loadmethod.'" type="hidden"/>'."\n";
-			if (!empty($savemethod))	$out .= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";
-			if (!empty($ext_element))	$out .= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";
+			if (!empty($savemethod)) {
+				$out .= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";
+			}
+			if (!empty($ext_element)) {
+				$out .= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";
+			}
 			if (!empty($custommsg))
 			{
 				if (is_array($custommsg))
 				{
-					if (!empty($custommsg['success']))
-						$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
-						if (!empty($custommsg['error']))
-							$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
-				} else $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
+					if (!empty($custommsg['success'])) {
+											$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
+					}
+						if (!empty($custommsg['error'])) {
+													$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
+						}
+				} else {
+					$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
+				}
 			}
 			if ($inputType == 'textarea') {
 				$out .= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";
@@ -511,12 +599,20 @@ 
 	 */
 	public function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 3, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0)
 	{
-		if ($incbefore) $text = $incbefore.$text;
-		if (!$htmltext) return $text;
+		if ($incbefore) {
+			$text = $incbefore.$text;
+		}
+		if (!$htmltext) {
+			return $text;
+		}
 
 		$tag = 'td';
-		if ($notabs == 2) $tag = 'div';
-		if ($notabs == 3) $tag = 'span';
+		if ($notabs == 2) {
+			$tag = 'div';
+		}
+		if ($notabs == 3) {
+			$tag = 'span';
+		}
 		// Sanitize tooltip
 		$htmltext = str_replace(array("\r", "\n"), '', $htmltext);
 
@@ -538,17 +634,36 @@ 
 		if ($tooltipon == 2 || $tooltipon == 3)
 		{
 			$paramfortooltipimg = ' class="'.$classfortooltip.($notabs != 3 ? ' inline-block' : '').($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'"';
-			if ($tooltiptrigger == '') $paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip
-			else $paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';
-		} else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+			if ($tooltiptrigger == '') {
+				$paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"';
+			}
+			// Attribut to put on img tag to store tooltip
+			else {
+				$paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';
+			}
+		} else {
+			$paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : '');
+		}
+		// Attribut to put on td text tag
 		if ($tooltipon == 1 || $tooltipon == 3)
 		{
 			$paramfortooltiptd = ' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'" ';
-			if ($tooltiptrigger == '') $paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip
-			else $paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';
-		} else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
-		if (empty($notabs)) $s .= '<table class="nobordernopadding"><tr style="height: auto;">';
-		elseif ($notabs == 2) $s .= '<div class="inline-block'.($forcenowrap ? ' nowrap' : '').'">';
+			if ($tooltiptrigger == '') {
+				$paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"';
+			}
+			// Attribut to put on td tag to store tooltip
+			else {
+				$paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';
+			}
+		} else {
+			$paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : '');
+		}
+		// Attribut to put on td text tag
+		if (empty($notabs)) {
+			$s .= '<table class="nobordernopadding"><tr style="height: auto;">';
+		} elseif ($notabs == 2) {
+			$s .= '<div class="inline-block'.($forcenowrap ? ' nowrap' : '').'">';
+		}
 		// Define value if value is before
 		if ($direction < 0) {
 			$s .= '<'.$tag.$paramfortooltipimg;
@@ -559,15 +674,22 @@ 
 		}
 		// Use another method to help avoid having a space in value in order to use this value with jquery
 		// Define label
-		if ((string) $text != '') $s .= '<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
+		if ((string) $text != '') {
+			$s .= '<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
+		}
 		// Define value if value is after
 		if ($direction > 0) {
 			$s .= '<'.$tag.$paramfortooltipimg;
-			if ($tag == 'td') $s .= ' class="valignmiddle" width="14"';
+			if ($tag == 'td') {
+				$s .= ' class="valignmiddle" width="14"';
+			}
 			$s .= '>'.$textfordialog.$img.'</'.$tag.'>';
 		}
-		if (empty($notabs)) $s .= '</tr></table>';
-		elseif ($notabs == 2) $s .= '</div>';
+		if (empty($notabs)) {
+			$s .= '</tr></table>';
+		} elseif ($notabs == 2) {
+			$s .= '</div>';
+		}
 
 		return $s;
 	}
@@ -591,17 +713,23 @@ 
 		global $conf, $langs;
 
 		$alt = '';
-		if ($tooltiptrigger) $alt = $langs->transnoentitiesnoconv("ClickToShowHelp");
+		if ($tooltiptrigger) {
+			$alt = $langs->transnoentitiesnoconv("ClickToShowHelp");
+		}
 
 		//For backwards compatibility
-		if ($type == '0') $type = 'info';
-		elseif ($type == '1') $type = 'help';
+		if ($type == '0') {
+			$type = 'info';
+		} elseif ($type == '1') {
+			$type = 'help';
+		}
 
 		// If info or help with no javascript, show only text
 		if (empty($conf->use_javascript_ajax))
 		{
-			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable')	return $text;
-			else {
+			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') {
+				return $text;
+			} else {
 				$alt = $htmltext;
 				$htmltext = '';
 			}
@@ -610,7 +738,9 @@ 
 		// If info or help with smartphone, show only text (tooltip hover can't works)
 		if (!empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger))
 		{
-			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') return $text;
+			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') {
+				return $text;
+			}
 		}
 		// If info or help with smartphone, show only text (tooltip on click does not works with dialog on smaprtphone)
 		//if (! empty($conf->dol_no_mouse_hover) && ! empty($tooltiptrigger))
@@ -619,13 +749,22 @@ 
 		//}
 
 		$img = '';
-		if ($type == 'info') $img = img_help(0, $alt);
-		elseif ($type == 'help') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
-		elseif ($type == 'helpclickable') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
-		elseif ($type == 'superadmin') $img = img_picto($alt, 'redstar');
-		elseif ($type == 'admin') $img = img_picto($alt, 'star');
-		elseif ($type == 'warning') $img = img_warning($alt);
-		elseif ($type != 'none') $img = img_picto($alt, $type); // $type can be an image path
+		if ($type == 'info') {
+			$img = img_help(0, $alt);
+		} elseif ($type == 'help') {
+			$img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
+		} elseif ($type == 'helpclickable') {
+			$img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
+		} elseif ($type == 'superadmin') {
+			$img = img_picto($alt, 'redstar');
+		} elseif ($type == 'admin') {
+			$img = img_picto($alt, 'star');
+		} elseif ($type == 'warning') {
+			$img = img_warning($alt);
+		} elseif ($type != 'none') {
+			$img = img_picto($alt, $type);
+		}
+		// $type can be an image path
 
 		return $this->textwithtooltip($text, $htmltext, ((($tooltiptrigger && !$img) || strpos($type, 'clickable')) ? 3 : 2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger, $forcenowrap);
 	}
@@ -653,7 +792,9 @@ 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreMassActions', $parameters); // Note that $action and $object may have been modified by hook
 		// check if there is a mass action
-		if (count($arrayofaction) == 0 && empty($hookmanager->resPrint)) return;
+		if (count($arrayofaction) == 0 && empty($hookmanager->resPrint)) {
+			return;
+		}
 		if (empty($reshook))
 		{
 			$ret .= '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>-- '.$langs->trans("SelectAction").' --</option>';
@@ -666,7 +807,9 @@ 
 
 		$ret .= '</select>';
 
-                if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.' . $name . 'select');
+                if (empty($conf->dol_optimize_smallscreen)) {
+                	$ret .= ajax_combobox('.' . $name . 'select');
+                }
 
 		// Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
 		$ret .= '<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">'; // Hidden button BEFORE so it is the one used when we submit with ENTER.
@@ -794,20 +937,27 @@ 
 					$i++;
 				}
 
-				if (empty($disablefavorites)) array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
-				else $countryArray = dol_sort_array($countryArray, 'label');
+				if (empty($disablefavorites)) {
+					array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
+				} else {
+					$countryArray = dol_sort_array($countryArray, 'label');
+				}
 
 				if ($showempty)
 				{
 					$out .= '<option value="">&nbsp;</option>'."\n";
 				}
 
-				if ($addspecialentries)	// Add dedicated entries for groups of countries
+				if ($addspecialentries) {
+					// Add dedicated entries for groups of countries
 				{
 					//if ($showempty) $out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
 					$out .= '<option value="special_allnotme"'.($selected == 'special_allnotme' ? ' selected' : '').'>'.$langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
+				}
 					$out .= '<option value="special_eec"'.($selected == 'special_eec' ? ' selected' : '').'>'.$langs->trans("CountriesInEEC").'</option>';
-					if ($mysoc->isInEEC()) $out .= '<option value="special_eecnotme"'.($selected == 'special_eecnotme' ? ' selected' : '').'>'.$langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
+					if ($mysoc->isInEEC()) {
+						$out .= '<option value="special_eecnotme"'.($selected == 'special_eecnotme' ? ' selected' : '').'>'.$langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
+					}
 					$out .= '<option value="special_noteec"'.($selected == 'special_noteec' ? ' selected' : '').'>'.$langs->trans("CountriesNotInEEC").'</option>';
 					$out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
 				}
@@ -815,10 +965,17 @@ 
 				foreach ($countryArray as $row)
 				{
 					//if (empty($showempty) && empty($row['rowid'])) continue;
-					if (empty($row['rowid'])) continue;
-					if (is_array($exclude_country_code) && count($exclude_country_code) && in_array($row['code_iso'], $exclude_country_code)) continue; // exclude some countries
+					if (empty($row['rowid'])) {
+						continue;
+					}
+					if (is_array($exclude_country_code) && count($exclude_country_code) && in_array($row['code_iso'], $exclude_country_code)) {
+						continue;
+					}
+					// exclude some countries
 
-					if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) $atleastonefavorite++;
+					if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) {
+						$atleastonefavorite++;
+					}
 					if (empty($row['favorite']) && $atleastonefavorite)
 					{
 						$atleastonefavorite = 0;
@@ -831,9 +988,14 @@ 
 					} else {
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">';
 					}
-					if ($row['label']) $out .= dol_trunc($row['label'], $maxlength, 'middle');
-					else $out .= '&nbsp;';
-					if ($row['code_iso']) $out .= ' ('.$row['code_iso'].')';
+					if ($row['label']) {
+						$out .= dol_trunc($row['label'], $maxlength, 'middle');
+					} else {
+						$out .= '&nbsp;';
+					}
+					if ($row['code_iso']) {
+						$out .= ' ('.$row['code_iso'].')';
+					}
 					$out .= '</option>';
 				}
 			}
@@ -919,7 +1081,9 @@ 
 						$out .= '<option value="'.$row['rowid'].'">';
 					}
 
-					if ($row['code']) $out .= $row['code'];
+					if ($row['code']) {
+						$out .= $row['code'];
+					}
 
 					$out .= '</option>';
 				}
@@ -960,21 +1124,29 @@ 
 		if ($forceall == 1 || (empty($forceall) && !empty($conf->product->enabled) && !empty($conf->service->enabled))
 			|| (empty($forceall) && empty($conf->product->enabled) && empty($conf->service->enabled)))
 		{
-			if (empty($hidetext)) print $langs->trans("Type").': ';
+			if (empty($hidetext)) {
+				print $langs->trans("Type").': ';
+			}
 			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
 			if ($showempty)
 			{
 				print '<option value="-1"';
-				if ($selected == -1) print ' selected';
+				if ($selected == -1) {
+					print ' selected';
+				}
 				print '>&nbsp;</option>';
 			}
 
 			print '<option value="0"';
-			if (0 == $selected) print ' selected';
+			if (0 == $selected) {
+				print ' selected';
+			}
 			print '>'.$langs->trans("Product");
 
 			print '<option value="1"';
-			if (1 == $selected) print ' selected';
+			if (1 == $selected) {
+				print ' selected';
+			}
 			print '>'.$langs->trans("Service");
 
 			print '</select>';
@@ -990,9 +1162,12 @@ 
 			print $langs->trans("Product");
 			print '<input type="hidden" name="'.$htmlname.'" value="0">';
 		}
-		if ($forceall < 0)	// This should happened only for contracts when both predefined product and service are disabled.
+		if ($forceall < 0) {
+			// This should happened only for contracts when both predefined product and service are disabled.
 		{
-			print '<input type="hidden" name="'.$htmlname.'" value="1">'; // By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1
+			print '<input type="hidden" name="'.$htmlname.'" value="1">';
+		}
+		// By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1
 		}
 	}
 
@@ -1008,7 +1183,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_types_fees);
-		if ($num > 0) return 0; // Cache already loaded
+		if ($num > 0) {
+			return 0;
+		}
+		// Cache already loaded
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -1065,21 +1243,27 @@ 
 		if ($showempty)
 		{
 			print '<option value="-1"';
-			if ($selected == -1) print ' selected';
+			if ($selected == -1) {
+				print ' selected';
+			}
 			print '>&nbsp;</option>';
 		}
 
 		foreach ($this->cache_types_fees as $key => $value)
 		{
 			print '<option value="'.$key.'"';
-			if ($key == $selected) print ' selected';
+			if ($key == $selected) {
+				print ' selected';
+			}
 			print '>';
 			print $value;
 			print '</option>';
 		}
 
 		print '</select>';
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 	}
 
 
@@ -1145,8 +1329,9 @@ 
 			$urloption = 'htmlname='.urlencode($htmlname).'&outjson=1&filter='.urlencode($filter).($showtype ? '&showtype='.urlencode($showtype) : '');
 			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
-			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
-			elseif ($hidelabel > 1) {
+			if (empty($hidelabel)) {
+				print $langs->trans("RefOrLabel").' : ';
+			} elseif ($hidelabel > 1) {
 				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
 				if ($hidelabel == 2) {
 					$out .= img_picto($langs->trans("Search"), 'search');
@@ -1193,8 +1378,11 @@ 
 		$num = 0;
 		$outarray = array();
 
-		if ($selected === '') $selected = array();
-		elseif (!is_array($selected)) $selected = array($selected);
+		if ($selected === '') {
+			$selected = array();
+		} elseif (!is_array($selected)) {
+			$selected = array($selected);
+		}
 
 		// Clean $filter that may contains sql conditions so sql code
 		if (function_exists('testSqlAndScriptInject')) {
@@ -1212,15 +1400,25 @@ 
 		}
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$user->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
 			$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid=s.fk_pays";
 		}
 		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
-		if (!empty($user->socid)) $sql .= " AND s.rowid = ".$user->socid;
-		if ($filter) $sql .= " AND (".$filter.")";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-		if (!empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) $sql .= " AND s.status <> 0";
+		if (!empty($user->socid)) {
+			$sql .= " AND s.rowid = ".$user->socid;
+		}
+		if ($filter) {
+			$sql .= " AND (".$filter.")";
+		}
+		if (!$user->rights->societe->client->voir && !$user->socid) {
+			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if (!empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) {
+			$sql .= " AND s.status <> 0";
+		}
 		// Add criteria
 		if ($filterkey && $filterkey != '')
 		{
@@ -1229,13 +1427,19 @@ 
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
-			if (count($scrit) > 1) $sql .= "(";
+			if (count($scrit) > 1) {
+				$sql .= "(";
+			}
 			foreach ($scrit as $crit) {
-				if ($i > 0) $sql .= " AND ";
+				if ($i > 0) {
+					$sql .= " AND ";
+				}
 				$sql .= "(s.nom LIKE '".$this->db->escape($prefix.$crit)."%')";
 				$i++;
 			}
-			if (count($scrit) > 1) $sql .= ")";
+			if (count($scrit) > 1) {
+				$sql .= ")";
+			}
 			if (!empty($conf->barcode->enabled))
 			{
 				$sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
@@ -1265,10 +1469,15 @@ 
 			{
 				// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
 				//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
-				else $textifempty .= $langs->trans("All");
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				} else {
+					$textifempty .= $langs->trans("All");
+				}
+			}
+			if ($showempty) {
+				$out .= '<option value="-1">'.$textifempty.'</option>'."\n";
 			}
-			if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -1296,11 +1505,21 @@ 
 
 					if ($showtype)
 					{
-						if ($obj->client || $obj->fournisseur) $label .= ' (';
-						if ($obj->client == 1 || $obj->client == 3) $label .= $langs->trans("Customer");
-						if ($obj->client == 2 || $obj->client == 3) $label .= ($obj->client == 3 ? ', ' : '').$langs->trans("Prospect");
-						if ($obj->fournisseur) $label .= ($obj->client ? ', ' : '').$langs->trans("Supplier");
-						if ($obj->client || $obj->fournisseur) $label .= ')';
+						if ($obj->client || $obj->fournisseur) {
+							$label .= ' (';
+						}
+						if ($obj->client == 1 || $obj->client == 3) {
+							$label .= $langs->trans("Customer");
+						}
+						if ($obj->client == 2 || $obj->client == 3) {
+							$label .= ($obj->client == 3 ? ', ' : '').$langs->trans("Prospect");
+						}
+						if ($obj->fournisseur) {
+							$label .= ($obj->client ? ', ' : '').$langs->trans("Supplier");
+						}
+						if ($obj->client || $obj->fournisseur) {
+							$label .= ')';
+						}
 					}
 
 					if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
@@ -1323,7 +1542,9 @@ 
 					}
 
 					$i++;
-					if (($i % 10) == 0) $out .= "\n";
+					if (($i % 10) == 0) {
+						$out .= "\n";
+					}
 				}
 			}
 			$out .= '</select>'."\n";
@@ -1333,7 +1554,9 @@ 
 
 		$this->result = array('nbofthirdparties'=>$num);
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -1360,7 +1583,9 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
 		$sql .= " WHERE re.fk_soc = ".(int) $socid;
 		$sql .= " AND re.entity = ".$conf->entity;
-		if ($filter) $sql .= " AND ".$filter;
+		if ($filter) {
+			$sql .= " AND ".$filter;
+		}
 		$sql .= " ORDER BY re.description ASC";
 
 		dol_syslog(get_class($this)."::select_remises", LOG_DEBUG);
@@ -1380,13 +1605,23 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 					$desc = dol_trunc($obj->description, 40);
-					if (preg_match('/\(CREDIT_NOTE\)/', $desc)) $desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
-					if (preg_match('/\(DEPOSIT\)/', $desc)) $desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
-					if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) $desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
-					if (preg_match('/\(EXCESS PAID\)/', $desc)) $desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);
+					if (preg_match('/\(CREDIT_NOTE\)/', $desc)) {
+						$desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
+					}
+					if (preg_match('/\(DEPOSIT\)/', $desc)) {
+						$desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
+					}
+					if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) {
+						$desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
+					}
+					if (preg_match('/\(EXCESS PAID\)/', $desc)) {
+						$desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);
+					}
 
 					$selectstring = '';
-					if ($selected > 0 && $selected == $obj->rowid) $selectstring = ' selected';
+					if ($selected > 0 && $selected == $obj->rowid) {
+						$selectstring = ' selected';
+					}
 
 					$disabled = '';
 					if ($maxvalue > 0 && $obj->amount_ttc > $maxvalue)
@@ -1398,7 +1633,9 @@ 
 					if (!empty($conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source))
 					{
 						$tmpfac = new Facture($this->db);
-						if ($tmpfac->fetch($obj->fk_facture_source) > 0) $desc = $desc.' - '.$tmpfac->ref;
+						if ($tmpfac->fetch($obj->fk_facture_source) > 0) {
+							$desc = $desc.' - '.$tmpfac->ref;
+						}
 					}
 
 					print '<option value="'.$obj->rowid.'"'.$selectstring.$disabled.'>'.$desc.' ('.price($obj->amount_ht).' '.$langs->trans("HT").' - '.price($obj->amount_ttc).' '.$langs->trans("TTC").')</option>';
@@ -1470,10 +1707,15 @@ 
 
 		$langs->load('companies');
 
-		if (empty($htmlid)) $htmlid = $htmlname;
+		if (empty($htmlid)) {
+			$htmlid = $htmlname;
+		}
 
-		if ($selected === '') $selected = array();
-		elseif (!is_array($selected)) $selected = array($selected);
+		if ($selected === '') {
+			$selected = array();
+		} elseif (!is_array($selected)) {
+			$selected = array($selected);
+		}
 		$out = '';
 
 		if (!is_object($hookmanager))
@@ -1484,12 +1726,20 @@ 
 
 		// We search third parties
 		$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";
-		if ($showsoc > 0) $sql .= " , s.nom as company";
+		if ($showsoc > 0) {
+			$sql .= " , s.nom as company";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-		if ($showsoc > 0) $sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";
+		if ($showsoc > 0) {
+			$sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";
+		}
 		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
-		if ($socid > 0 || $socid == -1) $sql .= " AND sp.fk_soc=".$socid;
-		if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql .= " AND sp.statut <> 0";
+		if ($socid > 0 || $socid == -1) {
+			$sql .= " AND sp.fk_soc=".$socid;
+		}
+		if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) {
+			$sql .= " AND sp.statut <> 0";
+		}
 		$sql .= " ORDER BY sp.lastname ASC";
 
 		dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG);
@@ -1504,9 +1754,15 @@ 
 				$out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
 			}
 
-			if ($htmlname != 'none' && !$options_only) $out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
-			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
-			if ($showempty == 2) $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
+			if ($htmlname != 'none' && !$options_only) {
+				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
+			}
+			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) {
+				$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
+			}
+			if ($showempty == 2) {
+				$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
+			}
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -1526,32 +1782,52 @@ 
 						if ($htmlname != 'none')
 						{
 							$disabled = 0;
-							if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) $disabled = 1;
-							if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) $disabled = 1;
+							if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) {
+								$disabled = 1;
+							}
+							if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) {
+								$disabled = 1;
+							}
 							if (!empty($selected) && in_array($obj->rowid, $selected))
 							{
 								$out .= '<option value="'.$obj->rowid.'"';
-								if ($disabled) $out .= ' disabled';
+								if ($disabled) {
+									$out .= ' disabled';
+								}
 								$out .= ' selected>';
 								$out .= $contactstatic->getFullName($langs);
-								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
-								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
+								if ($showfunction && $obj->poste) {
+									$out .= ' ('.$obj->poste.')';
+								}
+								if (($showsoc > 0) && $obj->company) {
+									$out .= ' - ('.$obj->company.')';
+								}
 								$out .= '</option>';
 							} else {
 								$out .= '<option value="'.$obj->rowid.'"';
-								if ($disabled) $out .= ' disabled';
+								if ($disabled) {
+									$out .= ' disabled';
+								}
 								$out .= '>';
 								$out .= $contactstatic->getFullName($langs);
-								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
-								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
+								if ($showfunction && $obj->poste) {
+									$out .= ' ('.$obj->poste.')';
+								}
+								if (($showsoc > 0) && $obj->company) {
+									$out .= ' - ('.$obj->company.')';
+								}
 								$out .= '</option>';
 							}
 						} else {
 							if (in_array($obj->rowid, $selected))
 							{
 								$out .= $contactstatic->getFullName($langs);
-								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
-								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
+								if ($showfunction && $obj->poste) {
+									$out .= ' ('.$obj->poste.')';
+								}
+								if (($showsoc > 0) && $obj->company) {
+									$out .= ' - ('.$obj->company.')';
+								}
 							}
 						}
 					}
@@ -1639,19 +1915,27 @@ 
 		global $conf, $user, $langs, $hookmanager;
 
 		// If no preselected user defined, we take current user
-		if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected = $user->id;
+		if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) {
+			$selected = $user->id;
+		}
 
-		if ($selected === '') $selected = array();
-		elseif (!is_array($selected)) $selected = array($selected);
+		if ($selected === '') {
+			$selected = array();
+		} elseif (!is_array($selected)) {
+			$selected = array($selected);
+		}
 
 		$excludeUsers = null;
 		$includeUsers = null;
 
 		// Permettre l'exclusion d'utilisateurs
-		if (is_array($exclude))	$excludeUsers = implode(",", $exclude);
+		if (is_array($exclude)) {
+			$excludeUsers = implode(",", $exclude);
+		}
 		// Permettre l'inclusion d'utilisateurs
-		if (is_array($include))	$includeUsers = implode(",", $include);
-		elseif ($include == 'hierarchy')
+		if (is_array($include)) {
+			$includeUsers = implode(",", $include);
+		} elseif ($include == 'hierarchy')
 		{
 			// Build list includeUsers to have only hierarchy
 			$includeUsers = implode(",", $user->getAllChildIds(0));
@@ -1674,8 +1958,11 @@ 
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=u.entity";
-			if ($force_entity) $sql .= " WHERE u.entity IN (0,".$force_entity.")";
-			else $sql .= " WHERE u.entity IS NOT NULL";
+			if ($force_entity) {
+				$sql .= " WHERE u.entity IN (0,".$force_entity.")";
+			} else {
+				$sql .= " WHERE u.entity IS NOT NULL";
+			}
 		} else {
 			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 			{
@@ -1686,19 +1973,33 @@ 
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
 			}
 		}
-		if (!empty($user->socid)) $sql .= " AND u.fk_soc = ".$user->socid;
-		if (is_array($exclude) && $excludeUsers) $sql .= " AND u.rowid NOT IN (".$excludeUsers.")";
-		if ($includeUsers) $sql .= " AND u.rowid IN (".$includeUsers.")";
-		if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) $sql .= " AND u.statut <> 0";
-		if (!empty($morefilter)) $sql .= " ".$morefilter;
+		if (!empty($user->socid)) {
+			$sql .= " AND u.fk_soc = ".$user->socid;
+		}
+		if (is_array($exclude) && $excludeUsers) {
+			$sql .= " AND u.rowid NOT IN (".$excludeUsers.")";
+		}
+		if ($includeUsers) {
+			$sql .= " AND u.rowid IN (".$includeUsers.")";
+		}
+		if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) {
+			$sql .= " AND u.statut <> 0";
+		}
+		if (!empty($morefilter)) {
+			$sql .= " ".$morefilter;
+		}
 
 		//Add hook to filter on user (for exemple on usergroup define in custom modules)
 		$reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectUsers', array(), $this, $action);
-		if (!empty($reshook)) $sql .= $hookmanager->resPrint;
+		if (!empty($reshook)) {
+			$sql .= $hookmanager->resPrint;
+		}
 
-		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
+		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
+			// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
 		{
 			$sql .= " ORDER BY u.firstname ASC";
+		}
 		} else {
 			$sql .= " ORDER BY u.lastname ASC";
 		}
@@ -1717,8 +2018,12 @@ 
 
 				// do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined
 				$out .= '<select class="flat'.($morecss ? ' minwidth100imp '.$morecss : ' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';
-				if ($show_empty && !$multiple) $out .= '<option value="-1"'.((empty($selected) || in_array(-1, $selected)) ? ' selected' : '').'>&nbsp;</option>'."\n";
-				if ($show_every) $out .= '<option value="-2"'.((in_array(-2, $selected)) ? ' selected' : '').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
+				if ($show_empty && !$multiple) {
+					$out .= '<option value="-1"'.((empty($selected) || in_array(-1, $selected)) ? ' selected' : '').'>&nbsp;</option>'."\n";
+				}
+				if ($show_every) {
+					$out .= '<option value="-2"'.((in_array(-2, $selected)) ? ' selected' : '').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
+				}
 
 				$userstatic = new User($this->db);
 
@@ -1731,16 +2036,22 @@ 
 					$userstatic->firstname = $obj->firstname;
 
 					$disableline = '';
-					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) $disableline = ($enableonlytext ? $enableonlytext : '1');
+					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {
+						$disableline = ($enableonlytext ? $enableonlytext : '1');
+					}
 
 					if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected)))
 					{
 						$out .= '<option value="'.$obj->rowid.'"';
-						if ($disableline) $out .= ' disabled';
+						if ($disableline) {
+							$out .= ' disabled';
+						}
 						$out .= ' selected>';
 					} else {
 						$out .= '<option value="'.$obj->rowid.'"';
-						if ($disableline) $out .= ' disabled';
+						if ($disableline) {
+							$out .= ' disabled';
+						}
 						$out .= '>';
 					}
 
@@ -1802,7 +2113,9 @@ 
 			dol_print_error($this->db);
 		}
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -1857,12 +2170,18 @@ 
 		}
 		$nbassignetouser = count($assignedtouser);
 
-		if ($nbassignetouser && $action != 'view') $out .= '<br>';
-		if ($nbassignetouser) $out .= '<ul class="attendees">';
+		if ($nbassignetouser && $action != 'view') {
+			$out .= '<br>';
+		}
+		if ($nbassignetouser) {
+			$out .= '<ul class="attendees">';
+		}
 		$i = 0; $ownerid = 0;
 		foreach ($assignedtouser as $key => $value)
 		{
-			if ($value['id'] == $ownerid) continue;
+			if ($value['id'] == $ownerid) {
+				continue;
+			}
 
 			$out .= '<li>';
 			$userstatic->fetch($value['id']);
@@ -1888,7 +2207,9 @@ 
 			$out .= '</li>';
 			$i++;
 		}
-		if ($nbassignetouser) $out .= '</ul>';
+		if ($nbassignetouser) {
+			$out .= '</ul>';
+		}
 
 		//$out.='</form>';
 		return $out;
@@ -1928,7 +2249,9 @@ 
 
 		// check parameters
 		$price_level = (!empty($price_level) ? $price_level : 0);
-		if (is_null($ajaxoptions)) $ajaxoptions = array();
+		if (is_null($ajaxoptions)) {
+			$ajaxoptions = array();
+		}
 
 		if (strval($filtertype) === '' && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 			if (!empty($conf->product->enabled) && empty($conf->service->enabled)) {
@@ -2040,8 +2363,9 @@ 
 				</script>
                 <?php
 			}
-			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
-			elseif ($hidelabel > 1) {
+			if (empty($hidelabel)) {
+				print $langs->trans("RefOrLabel").' : ';
+			} elseif ($hidelabel > 1) {
 				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
 				if ($hidelabel == 2) {
 					print img_picto($langs->trans("Search"), 'search');
@@ -2155,11 +2479,15 @@ 
 		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
 		{
 			$sql .= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";
-			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql .= " AND price_level=".$price_level;
+			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				$sql .= " AND price_level=".$price_level;
+			}
 			$sql .= " ORDER BY date_price";
 			$sql .= " DESC LIMIT 1) as price_rowid";
 			$sql .= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable
-			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql .= " AND price_level=".$price_level;
+			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				$sql .= " AND price_level=".$price_level;
+			}
 			$sql .= " ORDER BY date_price";
 			$sql .= " DESC LIMIT 1) as price_by_qty";
 			$selectFields .= ", price_rowid, price_by_qty";
@@ -2208,14 +2536,17 @@ 
 		} elseif ($finished == 1)
 		{
 			$sql .= " AND p.finished = ".$finished;
-			if ($status >= 0)  $sql .= " AND p.tosell = ".$status;
+			if ($status >= 0) {
+				$sql .= " AND p.tosell = ".$status;
+			}
 		} elseif ($status >= 0)
 		{
 			$sql .= " AND p.tosell = ".$status;
 		}
 		// Filter by product type
-		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type = ".$filtertype;
-		elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only
+		if (strval($filtertype) != '') {
+			$sql .= " AND p.fk_product_type = ".$filtertype;
+		} elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only
 			$sql .= " AND p.fk_product_type = 1";
 		} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
 			$sql .= " AND p.fk_product_type = 0";
@@ -2228,23 +2559,37 @@ 
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
-			if (count($scrit) > 1) $sql .= "(";
+			if (count($scrit) > 1) {
+				$sql .= "(";
+			}
 			foreach ($scrit as $crit)
 			{
-				if ($i > 0) $sql .= " AND ";
+				if ($i > 0) {
+					$sql .= " AND ";
+				}
 				$sql .= "(p.ref LIKE '".$db->escape($prefix.$crit)."%' OR p.label LIKE '".$db->escape($prefix.$crit)."%'";
-				if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.label LIKE '".$db->escape($prefix.$crit)."%'";
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
+					$sql .= " OR pl.label LIKE '".$db->escape($prefix.$crit)."%'";
+				}
 				if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION))
 				{
 					$sql .= " OR p.description LIKE '".$db->escape($prefix.$crit)."%'";
-					if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.description LIKE '".$db->escape($prefix.$crit)."%'";
+					if (!empty($conf->global->MAIN_MULTILANGS)) {
+						$sql .= " OR pl.description LIKE '".$db->escape($prefix.$crit)."%'";
+					}
+				}
+				if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {
+					$sql .= " OR pfp.ref_fourn LIKE '".$db->escape($prefix.$crit)."%'";
 				}
-				if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) $sql .= " OR pfp.ref_fourn LIKE '".$db->escape($prefix.$crit)."%'";
 				$sql .= ")";
 				$i++;
 			}
-			if (count($scrit) > 1) $sql .= ")";
-		  	if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";
+			if (count($scrit) > 1) {
+				$sql .= ")";
+			}
+		  	if (!empty($conf->barcode->enabled)) {
+		  		$sql .= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";
+		  	}
 			$sql .= ')';
 		}
 		if (count($warehouseStatusArray))
@@ -2290,12 +2635,19 @@ 
 			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
 			if (!empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
 			{
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
-				else $textifempty .= $langs->trans("All");
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				} else {
+					$textifempty .= $langs->trans("All");
+				}
 			} else {
-			    if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+			    if ($showempty && !is_numeric($showempty)) {
+			    	$textifempty = $langs->trans($showempty);
+			    }
+			}
+			if ($showempty) {
+				$out .= '<option value="0" selected>'.$textifempty.'</option>';
 			}
-			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
 
 			$i = 0;
 			while ($num && $i < $num)
@@ -2373,7 +2725,9 @@ 
 
 			$this->db->free($result);
 
-			if (empty($outputmode)) return $out;
+			if (empty($outputmode)) {
+				return $out;
+			}
 			return $outarray;
 		} else {
 			dol_print_error($db);
@@ -2416,8 +2770,12 @@ 
 		$maxlengtharticle = (empty($conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);
 
 		$label = $objp->label;
-		if (!empty($objp->label_translated)) $label = $objp->label_translated;
-		if (!empty($filterkey) && $filterkey != '') $label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $label, 1);
+		if (!empty($objp->label_translated)) {
+			$label = $objp->label_translated;
+		}
+		if (!empty($filterkey) && $filterkey != '') {
+			$label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $label, 1);
+		}
 
 		$outkey = $objp->rowid;
 		$outref = $objp->ref;
@@ -2431,7 +2789,9 @@ 
 		$outdurationvalue = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';
 		$outdurationunit = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, -1) : '';
 
-		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO))  require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+		}
 
         // Units
         $outvalUnits = '';
@@ -2480,22 +2840,35 @@ 
 		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
 		{
 		    if (!empty($user->rights->stock->lire)) {
-    			if ($objp->stock > 0) $opt .= ' class="product_line_stock_ok"';
-	       		elseif ($objp->stock <= 0) $opt .= ' class="product_line_stock_too_low"';
+    			if ($objp->stock > 0) {
+    				$opt .= ' class="product_line_stock_ok"';
+    			} elseif ($objp->stock <= 0) {
+	       			$opt .= ' class="product_line_stock_too_low"';
+	       		}
 		    }
 		}
 		$opt .= '>';
 		$opt .= $objp->ref;
-		if ($outbarcode) $opt .= ' ('.$outbarcode.')';
+		if ($outbarcode) {
+			$opt .= ' ('.$outbarcode.')';
+		}
 		$opt .= ' - '.dol_trunc($label, $maxlengtharticle);
-		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $opt .= ' ('.getCountry($outorigin, 1).')';
+		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) {
+			$opt .= ' ('.getCountry($outorigin, 1).')';
+		}
 
 		$objRef = $objp->ref;
-		if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
+		if (!empty($filterkey) && $filterkey != '') {
+			$objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
+		}
 		$outval .= $objRef;
-		if ($outbarcode) $outval .= ' ('.$outbarcode.')';
+		if ($outbarcode) {
+			$outval .= ' ('.$outbarcode.')';
+		}
 		$outval .= ' - '.dol_trunc($label, $maxlengtharticle);
-		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $outval .= ' ('.getCountry($outorigin, 1).')';
+		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) {
+			$outval .= ' ('.getCountry($outorigin, 1).')';
+		}
 
         // Units
         $opt .= $outvalUnits;
@@ -2628,9 +3001,11 @@ 
     			}
     			$outval .= $langs->transnoentities("Stock").':'.$objp->stock;
     			$outval .= '</span>';
-    			if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation
+    			if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO)) {
+    				// Warning, this option may slow down combo list generation
     			{
     			    $langs->load("stocks");
+    			}
 
     			    $tmpproduct = new Product($this->db);
     			    $tmpproduct->fetch($objp->rowid, '', '', '', 1, 1, 1); // Load product without lang and prices arrays (we just need to make ->virtual_stock() after)
@@ -2740,10 +3115,14 @@ 
         if ($conf->global->PRODUCT_USE_UNITS) {
             $sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
         }
-        if (!empty($conf->barcode->enabled)) $sql .= ", pfp.barcode";
+        if (!empty($conf->barcode->enabled)) {
+        	$sql .= ", pfp.barcode";
+        }
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON ( p.rowid = pfp.fk_product AND pfp.entity IN (".getEntity('product').") )";
-		if ($socid) $sql .= " AND pfp.fk_soc = ".$socid;
+		if ($socid) {
+			$sql .= " AND pfp.fk_soc = ".$socid;
+		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
         // Units
         if ($conf->global->PRODUCT_USE_UNITS) {
@@ -2751,8 +3130,12 @@ 
         }
 		$sql .= " WHERE p.entity IN (".getEntity('product').")";
 		$sql .= " AND p.tobuy = 1";
-		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);
-		if (!empty($filtre)) $sql .= " ".$filtre;
+		if (strval($filtertype) != '') {
+			$sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);
+		}
+		if (!empty($filtre)) {
+			$sql .= " ".$filtre;
+		}
 		// Add criteria on ref/label
 		if ($filterkey != '')
 		{
@@ -2761,14 +3144,20 @@ 
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
-			if (count($scrit) > 1) $sql .= "(";
+			if (count($scrit) > 1) {
+				$sql .= "(";
+			}
 			foreach ($scrit as $crit)
 			{
-				if ($i > 0) $sql .= " AND ";
+				if ($i > 0) {
+					$sql .= " AND ";
+				}
 				$sql .= "(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";
 				$i++;
 			}
-			if (count($scrit) > 1) $sql .= ")";
+			if (count($scrit) > 1) {
+				$sql .= ")";
+			}
 			if (!empty($conf->barcode->enabled)) {
                 $sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
                 $sql .= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
@@ -2791,8 +3180,11 @@ 
 
 			//$out.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax
 			$out .= '<select class="flat maxwidthonsmartphone'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-			if (!$selected) $out .= '<option value="0" selected>&nbsp;</option>';
-			else $out .= '<option value="0">&nbsp;</option>';
+			if (!$selected) {
+				$out .= '<option value="0" selected>&nbsp;</option>';
+			} else {
+				$out .= '<option value="0">&nbsp;</option>';
+			}
 
 			$i = 0;
 			while ($i < $num)
@@ -2800,7 +3192,10 @@ 
 				$objp = $this->db->fetch_object($result);
 
 				$outkey = $objp->idprodfournprice; // id in table of price
-				if (!$outkey && $alsoproductwithnosupplierprice) $outkey = 'idprod_'.$objp->rowid; // id of product
+				if (!$outkey && $alsoproductwithnosupplierprice) {
+					$outkey = 'idprod_'.$objp->rowid;
+				}
+				// id of product
 
 				$outref = $objp->ref;
 				$outval = '';
@@ -2848,11 +3243,17 @@ 
                 }
 
 				$objRef = $objp->ref;
-				if ($filterkey && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
+				if ($filterkey && $filterkey != '') {
+					$objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
+				}
 				$objRefFourn = $objp->ref_fourn;
-				if ($filterkey && $filterkey != '') $objRefFourn = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRefFourn, 1);
+				if ($filterkey && $filterkey != '') {
+					$objRefFourn = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRefFourn, 1);
+				}
 				$label = $objp->label;
-				if ($filterkey && $filterkey != '') $label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $label, 1);
+				if ($filterkey && $filterkey != '') {
+					$label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $label, 1);
+				}
 
 				$optlabel = $objp->ref;
 				if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
@@ -2939,9 +3340,11 @@ 
 						$outvallabel .= " - ".$reputations[$objp->supplier_reputation];
 					}
 				} else {
-					if (empty($alsoproductwithnosupplierprice))     // No supplier price defined for couple product/supplier
+					if (empty($alsoproductwithnosupplierprice)) {
+						// No supplier price defined for couple product/supplier
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
+					}
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
 					} else // No supplier price defined for product, even on other suppliers
 					{
@@ -2951,8 +3354,12 @@ 
 				}
 
 				$opt = '<option value="'.$outkey.'"';
-				if ($selected && $selected == $objp->idprodfournprice) $opt .= ' selected';
-				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) $opt .= ' disabled';
+				if ($selected && $selected == $objp->idprodfournprice) {
+					$opt .= ' selected';
+				}
+				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) {
+					$opt .= ' disabled';
+				}
 				if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0)
 				{
 					$opt .= ' pbq="'.$objp->idprodfournprice.'" data-pbq="'.$objp->idprodfournprice.'" data-pbqqty="'.$objp->quantity.'" data-pbqup="'.$objp->unitprice.'" data-pbqpercent="'.$objp->remise_percent.'"';
@@ -2989,7 +3396,9 @@ 
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
 
-			if (empty($outputmode)) return $out;
+			if (empty($outputmode)) {
+				return $out;
+			}
 			return $outarray;
 		} else {
 			dol_print_error($this->db);
@@ -3087,7 +3496,9 @@ 
 						$opt .= " - ";
 						$opt .= price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit");
 					}
-					if ($objp->duration) $opt .= " - ".$objp->duration;
+					if ($objp->duration) {
+						$opt .= " - ".$objp->duration;
+					}
 					$opt .= "</option>\n";
 
 					$form .= $opt;
@@ -3127,7 +3538,9 @@ 
 		if ($resql)
 		{
 			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-			if ($showempty) print '<option value="0">&nbsp;</option>';
+			if ($showempty) {
+				print '<option value="0">&nbsp;</option>';
+			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -3165,7 +3578,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_conditions_paiements);
-		if ($num > 0) return 0; // Cache already loaded
+		if ($num > 0) {
+			return 0;
+		}
+		// Cache already loaded
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -3212,7 +3628,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_availability);
-		if ($num > 0) return 0; // Cache already loaded
+		if ($num > 0) {
+			return 0;
+		}
+		// Cache already loaded
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -3265,7 +3684,9 @@ 
 		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
 
 		print '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';
-		if ($addempty) print '<option value="0">&nbsp;</option>';
+		if ($addempty) {
+			print '<option value="0">&nbsp;</option>';
+		}
 		foreach ($this->cache_availability as $id => $arrayavailability)
 		{
 			if ($selected == $id)
@@ -3278,7 +3699,9 @@ 
 			print '</option>';
 		}
 		print '</select>';
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 	}
 
 	/**
@@ -3291,7 +3714,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_demand_reason);
-		if ($num > 0) return 0; // Cache already loaded
+		if ($num > 0) {
+			return 0;
+		}
+		// Cache already loaded
 
 		$sql = "SELECT rowid, code, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX.'c_input_reason';
@@ -3309,8 +3735,14 @@ 
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
 				$label = ($obj->label != '-' ? $obj->label : '');
-				if ($langs->trans("DemandReasonType".$obj->code) != ("DemandReasonType".$obj->code)) $label = $langs->trans("DemandReasonType".$obj->code); // So translation key DemandReasonTypeSRC_XXX will work
-				if ($langs->trans($obj->code) != $obj->code) $label = $langs->trans($obj->code); // So translation key SRC_XXX will work
+				if ($langs->trans("DemandReasonType".$obj->code) != ("DemandReasonType".$obj->code)) {
+					$label = $langs->trans("DemandReasonType".$obj->code);
+				}
+				// So translation key DemandReasonTypeSRC_XXX will work
+				if ($langs->trans($obj->code) != $obj->code) {
+					$label = $langs->trans($obj->code);
+				}
+				// So translation key SRC_XXX will work
 
 				$tmparray[$obj->rowid]['id']   = $obj->rowid;
 				$tmparray[$obj->rowid]['code'] = $obj->code;
@@ -3345,10 +3777,14 @@ 
 		$this->loadCacheInputReason();
 
 		print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-		if ($addempty) print '<option value="0"'.(empty($selected) ? ' selected' : '').'>&nbsp;</option>';
+		if ($addempty) {
+			print '<option value="0"'.(empty($selected) ? ' selected' : '').'>&nbsp;</option>';
+		}
 		foreach ($this->cache_demand_reason as $id => $arraydemandreason)
 		{
-			if ($arraydemandreason['code'] == $exclude) continue;
+			if ($arraydemandreason['code'] == $exclude) {
+				continue;
+			}
 
 			if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code']))
 			{
@@ -3361,7 +3797,9 @@ 
 			print '</option>';
 		}
 		print '</select>';
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3376,7 +3814,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_types_paiements);
-		if ($num > 0) return $num; // Cache already loaded
+		if ($num > 0) {
+			return $num;
+		}
+		// Cache already loaded
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -3440,10 +3881,14 @@ 
 		$this->load_cache_conditions_paiements();
 
 		// Set default value if not already set by caller
-		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
+		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) {
+			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
+		}
 
 		print '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
-		if ($addempty) print '<option value="0">&nbsp;</option>';
+		if ($addempty) {
+			print '<option value="0">&nbsp;</option>';
+		}
 		foreach ($this->cache_conditions_paiements as $id => $arrayconditions)
 		{
 			if ($selected == $id)
@@ -3456,7 +3901,9 @@ 
 			print '</option>';
 		}
 		print '</select>';
-		if ($user->admin && empty($noinfoadmin)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin && empty($noinfoadmin)) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 	}
 
 
@@ -3484,48 +3931,78 @@ 
 		dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
 
 		$filterarray = array();
-		if ($filtertype == 'CRDT')  	$filterarray = array(0, 2, 3);
-		elseif ($filtertype == 'DBIT') 	$filterarray = array(1, 2, 3);
-		elseif ($filtertype != '' && $filtertype != '-1') $filterarray = explode(',', $filtertype);
+		if ($filtertype == 'CRDT') {
+			$filterarray = array(0, 2, 3);
+		} elseif ($filtertype == 'DBIT') {
+			$filterarray = array(1, 2, 3);
+		} elseif ($filtertype != '' && $filtertype != '-1') {
+			$filterarray = explode(',', $filtertype);
+		}
 
 		$this->load_cache_types_paiements();
 
 		// Set default value if not already set by caller
-		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID;
+		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID)) {
+			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID;
+		}
 
 		print '<select id="select'.$htmlname.'" class="flat selectpaymenttypes'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
-		if ($empty) print '<option value="">&nbsp;</option>';
+		if ($empty) {
+			print '<option value="">&nbsp;</option>';
+		}
 		foreach ($this->cache_types_paiements as $id => $arraytypes)
 		{
 			// If not good status
-			if ($active >= 0 && $arraytypes['active'] != $active) continue;
+			if ($active >= 0 && $arraytypes['active'] != $active) {
+				continue;
+			}
 
 			// On passe si on a demande de filtrer sur des modes de paiments particuliers
-			if (count($filterarray) && !in_array($arraytypes['type'], $filterarray)) continue;
+			if (count($filterarray) && !in_array($arraytypes['type'], $filterarray)) {
+				continue;
+			}
 
 			// We discard empty line if showempty is on because an empty line has already been output.
-			if ($empty && empty($arraytypes['code'])) continue;
+			if ($empty && empty($arraytypes['code'])) {
+				continue;
+			}
 
-			if ($format == 0) print '<option value="'.$id.'"';
-			elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
-			elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
-			elseif ($format == 3) print '<option value="'.$id.'"';
+			if ($format == 0) {
+				print '<option value="'.$id.'"';
+			} elseif ($format == 1) {
+				print '<option value="'.$arraytypes['code'].'"';
+			} elseif ($format == 2) {
+				print '<option value="'.$arraytypes['code'].'"';
+			} elseif ($format == 3) {
+				print '<option value="'.$id.'"';
+			}
 			// Print attribute selected or not
 			if ($format == 1 || $format == 2) {
-				if ($selected == $arraytypes['code']) print ' selected';
+				if ($selected == $arraytypes['code']) {
+					print ' selected';
+				}
 			} else {
-				if ($selected == $id) print ' selected';
+				if ($selected == $id) {
+					print ' selected';
+				}
 			}
 			print '>';
-			if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
-			elseif ($format == 1) $value = $arraytypes['code'];
-			elseif ($format == 2) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
-			elseif ($format == 3) $value = $arraytypes['code'];
+			if ($format == 0) {
+				$value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+			} elseif ($format == 1) {
+				$value = $arraytypes['code'];
+			} elseif ($format == 2) {
+				$value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+			} elseif ($format == 3) {
+				$value = $arraytypes['code'];
+			}
 			print $value ? $value : '&nbsp;';
 			print '</option>';
 		}
 		print '</select>';
-		if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin && !$noadmininfo) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 	}
 
 
@@ -3582,7 +4059,9 @@ 
 		$sql = "SELECT rowid, code, libelle as label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode";
 		$sql .= " WHERE active > 0";
-		if ($filtre) $sql .= " AND ".$filtre;
+		if ($filtre) {
+			$sql .= " AND ".$filtre;
+		}
 		$sql .= " ORDER BY libelle ASC";
 
 		dol_syslog(get_class($this)."::selectShippingMode", LOG_DEBUG);
@@ -3607,7 +4086,9 @@ 
 					$i++;
 				}
 				print "</select>";
-				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				if ($user->admin) {
+					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				}
 			} else {
 				print $langs->trans("NoShippingMethodDefined");
 			}
@@ -3725,15 +4206,19 @@ 
 		$resql = $this->db->query($sql);
 		if ($resql && $this->db->num_rows($resql) > 0)
 		{
-			if ($showempty) $return .= '<option value="none"></option>';
+			if ($showempty) {
+				$return .= '<option value="none"></option>';
+			}
 
 			while ($res = $this->db->fetch_object($resql))
 			{
 			    $unitLabel = $res->label;
-			    if (!empty($langs->tab_translate['unit'.$res->code]))	// check if Translation is available before
+			    if (!empty($langs->tab_translate['unit'.$res->code])) {
+			    	// check if Translation is available before
 			    {
 			        $unitLabel = $langs->trans('unit'.$res->code) != $res->label ? $langs->trans('unit'.$res->code) : $res->label;
 			    }
+			    }
 
 				if ($selected == $res->rowid)
 				{
@@ -3772,8 +4257,12 @@ 
 		$sql = "SELECT rowid, label, bank, clos as status, currency_code";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
 		$sql .= " WHERE entity IN (".getEntity('bank_account').")";
-		if ($status != 2) $sql .= " AND clos = ".(int) $status;
-		if ($filtre) $sql .= " AND ".$filtre;
+		if ($status != 2) {
+			$sql .= " AND clos = ".(int) $status;
+		}
+		if ($filtre) {
+			$sql .= " AND ".$filtre;
+		}
 		$sql .= " ORDER BY label";
 
 		dol_syslog(get_class($this)."::select_comptes", LOG_DEBUG);
@@ -3800,15 +4289,22 @@ 
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->label);
-					if ($showcurrency) print ' ('.$obj->currency_code.')';
-					if ($status == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
+					if ($showcurrency) {
+						print ' ('.$obj->currency_code.')';
+					}
+					if ($status == 2 && $obj->status == 1) {
+						print ' ('.$langs->trans("Closed").')';
+					}
 					print '</option>';
 					$i++;
 				}
 				print "</select>";
 			} else {
-				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
-				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
+				if ($status == 0) {
+					print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
+				} else {
+					print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
+				}
 			}
 		} else {
 			dol_print_error($this->db);
@@ -3839,8 +4335,12 @@ 
 		$sql = "SELECT rowid, name, fk_country, status, entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."establishment";
 		$sql .= " WHERE 1=1";
-		if ($status != 2) $sql .= " AND status = ".(int) $status;
-		if ($filtre) $sql .= " AND ".$filtre;
+		if ($status != 2) {
+			$sql .= " AND status = ".(int) $status;
+		}
+		if ($filtre) {
+			$sql .= " AND ".$filtre;
+		}
 		$sql .= " ORDER BY name";
 
 		dol_syslog(get_class($this)."::select_establishment", LOG_DEBUG);
@@ -3867,14 +4367,19 @@ 
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->name);
-					if ($status == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
+					if ($status == 2 && $obj->status == 1) {
+						print ' ('.$langs->trans("Closed").')';
+					}
 					print '</option>';
 					$i++;
 				}
 				print "</select>";
 			} else {
-				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveEstablishmentDefined").'</span>';
-				else print '<span class="opacitymedium">'.$langs->trans("NoEstablishmentFound").'</span>';
+				if ($status == 0) {
+					print '<span class="opacitymedium">'.$langs->trans("NoActiveEstablishmentDefined").'</span>';
+				} else {
+					print '<span class="opacitymedium">'.$langs->trans("NoEstablishmentFound").'</span>';
+				}
 			}
 		} else {
 			dol_print_error($this->db);
@@ -3898,7 +4403,9 @@ 
 			print '<input type="hidden" name="action" value="setbankaccount">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			$nbaccountfound = $this->select_comptes($selected, $htmlname, 0, '', $addempty);
-			if ($nbaccountfound > 0) print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			if ($nbaccountfound > 0) {
+				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			}
 			print '</form>';
 		} else {
 			$langs->load('banks');
@@ -3907,7 +4414,9 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 				$bankstatic = new Account($this->db);
 				$result = $bankstatic->fetch($selected);
-				if ($result) print $bankstatic->getNomUrl(1);
+				if ($result) {
+					print $bankstatic->getNomUrl(1);
+				}
 			} else {
 				print "&nbsp;";
 			}
@@ -3963,11 +4472,15 @@ 
 				while ($i < $num)
 				{
 					$objp = $this->db->fetch_object($result);
-					if ($objp) $cate_arbo[$objp->rowid] = array('id'=>$objp->rowid, 'fulllabel'=>$objp->label);
+					if ($objp) {
+						$cate_arbo[$objp->rowid] = array('id'=>$objp->rowid, 'fulllabel'=>$objp->label);
+					}
 					$i++;
 				}
 				$this->db->free($result);
-			} else dol_print_error($this->db);
+			} else {
+				dol_print_error($this->db);
+			}
 		} else {
 			$cat = new Categorie($this->db);
             $cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
@@ -3977,8 +4490,9 @@ 
 		$outarray = array();
 		if (is_array($cate_arbo))
 		{
-			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
-			else {
+			if (!count($cate_arbo)) {
+				$output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
+			} else {
 				$output .= '<option value="-1">&nbsp;</option>';
 				foreach ($cate_arbo as $key => $value)
 				{
@@ -3997,7 +4511,9 @@ 
 		$output .= '</select>';
 		$output .= "\n";
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $output;
 	}
 
@@ -4060,7 +4576,9 @@ 
 
 		// Clean parameters
 		$newselectedchoice = empty($selectedchoice) ? "no" : $selectedchoice;
-		if ($conf->browser->layout == 'phone') $width = '95%';
+		if ($conf->browser->layout == 'phone') {
+			$width = '95%';
+		}
 
 		// Set height automatically if not defined
 		if (empty($height)) {
@@ -4104,7 +4622,9 @@ 
 					} elseif ($input['type'] == 'select')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
-						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd left">';
+						if (!empty($input['label'])) {
+							$more .= $input['label'].'</div><div class="tagtd left">';
+						}
 						$more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);
 						$more .= '</div></div>'."\n";
 					} elseif ($input['type'] == 'checkbox')
@@ -4112,9 +4632,15 @@ 
 						$more .= '<div class="tagtr">';
 						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].' </div><div class="tagtd">';
 						$more .= '<input type="checkbox" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$moreattr;
-						if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') $more .= ' checked';
-						if (is_bool($input['value']) && $input['value']) $more .= ' checked';
-						if (isset($input['disabled'])) $more .= ' disabled';
+						if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') {
+							$more .= ' checked';
+						}
+						if (is_bool($input['value']) && $input['value']) {
+							$more .= ' checked';
+						}
+						if (isset($input['disabled'])) {
+							$more .= ' disabled';
+						}
 						$more .= ' /></div>';
 						$more .= '</div>'."\n";
 					} elseif ($input['type'] == 'radio')
@@ -4123,10 +4649,15 @@ 
 						foreach ($input['values'] as $selkey => $selval)
 						{
 							$more .= '<div class="tagtr">';
-							if ($i == 0) $more .= '<div class="tagtd'.(empty($input['tdclass']) ? ' tdtop' : (' tdtop '.$input['tdclass'])).'">'.$input['label'].'</div>';
-							else $more .= '<div clas="tagtd'.(empty($input['tdclass']) ? '' : (' "'.$input['tdclass'])).'">&nbsp;</div>';
+							if ($i == 0) {
+								$more .= '<div class="tagtd'.(empty($input['tdclass']) ? ' tdtop' : (' tdtop '.$input['tdclass'])).'">'.$input['label'].'</div>';
+							} else {
+								$more .= '<div clas="tagtd'.(empty($input['tdclass']) ? '' : (' "'.$input['tdclass'])).'">&nbsp;</div>';
+							}
 							$more .= '<div class="tagtd"><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;
-							if ($input['disabled']) $more .= ' disabled';
+							if ($input['disabled']) {
+								$more .= ' disabled';
+							}
 							$more .= ' /> ';
 							$more .= $selval;
 							$more .= '</div></div>'."\n";
@@ -4146,7 +4677,9 @@ 
 					} elseif ($input['type'] == 'other')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
-						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd">';
+						if (!empty($input['label'])) {
+							$more .= $input['label'].'</div><div class="tagtd">';
+						}
 						$more .= $input['value'];
 						$more .= '</div></div>'."\n";
 					} elseif ($input['type'] == 'onecolumn')
@@ -4164,8 +4697,12 @@ 
 		// JQUI method dialog is broken with jmobile, we use standard HTML.
 		// Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx
 		// See page product/card.php for example
-		if (!empty($conf->dol_use_jmobile)) $useajax = 0;
-		if (empty($conf->use_javascript_ajax)) $useajax = 0;
+		if (!empty($conf->dol_use_jmobile)) {
+			$useajax = 0;
+		}
+		if (empty($conf->use_javascript_ajax)) {
+			$useajax = 0;
+		}
 
 		if ($useajax)
 		{
@@ -4187,8 +4724,12 @@ 
 				foreach ($formquestion as $key => $input)
 				{
 					//print "xx ".$key." rr ".is_array($input)."<br>\n";
-					if (is_array($input) && isset($input['name'])) array_push($inputok, $input['name']);
-					if (isset($input['inputko']) && $input['inputko'] == 1) array_push($inputko, $input['name']);
+					if (is_array($input) && isset($input['name'])) {
+						array_push($inputok, $input['name']);
+					}
+					if (isset($input['inputko']) && $input['inputko'] == 1) {
+						array_push($inputko, $input['name']);
+					}
 				}
 			}
 			// Show JQuery confirm box.
@@ -4277,7 +4818,9 @@ 
 		} else {
 			$formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";
 
-			if (empty($disableformtag)) $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
+			if (empty($disableformtag)) {
+				$formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
+			}
 
 			$formconfirm .= '<input type="hidden" name="action" value="'.$action.'">'."\n";
 			$formconfirm .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
@@ -4311,7 +4854,9 @@ 
 
 			$formconfirm .= '</table>'."\n";
 
-			if (empty($disableformtag)) $formconfirm .= "</form>\n";
+			if (empty($disableformtag)) {
+				$formconfirm .= "</form>\n";
+			}
 			$formconfirm .= '<br>';
 
 			$formconfirm .= "<!-- end formconfirm -->\n";
@@ -4514,11 +5059,16 @@ 
 			$ret .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			$ret .= '</tr></table></form>';
 		} else {
-			if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');
-			else $ret .= dol_print_date($selected, 'day');
+			if ($displayhour) {
+				$ret .= dol_print_date($selected, 'dayhour');
+			} else {
+				$ret .= dol_print_date($selected, 'day');
+			}
 		}
 
-		if (empty($nooutput)) print $ret;
+		if (empty($nooutput)) {
+			print $ret;
+		}
 		return $ret;
 	}
 
@@ -4654,7 +5204,9 @@ 
 			if (!empty($rate))
 			{
 				print price($rate, 1, $langs, 1, 0);
-				if ($currency && $rate != 1) print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
+				if ($currency && $rate != 1) {
+					print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
+				}
 			} else {
 				print 1;
 			}
@@ -4691,24 +5243,42 @@ 
 			if (!empty($discount_type)) {
 				if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 				{
-					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") $translationKey = 'HasAbsoluteDiscountFromSupplier'; // If we want deposit to be substracted to payments only and not to total of final invoice
-					else $translationKey = 'HasCreditNoteFromSupplier';
+					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") {
+						$translationKey = 'HasAbsoluteDiscountFromSupplier';
+					}
+					// If we want deposit to be substracted to payments only and not to total of final invoice
+					else {
+						$translationKey = 'HasCreditNoteFromSupplier';
+					}
 				} else {
-					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") $translationKey = 'HasAbsoluteDiscountFromSupplier';
-					else $translationKey = 'HasCreditNoteFromSupplier';
+					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {
+						$translationKey = 'HasAbsoluteDiscountFromSupplier';
+					} else {
+						$translationKey = 'HasCreditNoteFromSupplier';
+					}
 				}
 			} else {
 				if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 				{
-					if (!$filter || $filter == "fk_facture_source IS NULL") $translationKey = 'CompanyHasAbsoluteDiscount'; // If we want deposit to be substracted to payments only and not to total of final invoice
-					else $translationKey = 'CompanyHasCreditNote';
+					if (!$filter || $filter == "fk_facture_source IS NULL") {
+						$translationKey = 'CompanyHasAbsoluteDiscount';
+					}
+					// If we want deposit to be substracted to payments only and not to total of final invoice
+					else {
+						$translationKey = 'CompanyHasCreditNote';
+					}
 				} else {
-					if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") $translationKey = 'CompanyHasAbsoluteDiscount';
-					else $translationKey = 'CompanyHasCreditNote';
+					if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {
+						$translationKey = 'CompanyHasAbsoluteDiscount';
+					} else {
+						$translationKey = 'CompanyHasCreditNote';
+					}
 				}
 			}
 			print $langs->trans($translationKey, price($amount, 0, $langs, 0, 0, -1, $conf->currency));
-			if (empty($hidelist)) print ': ';
+			if (empty($hidelist)) {
+				print ': ';
+			}
 			print '</div>';
 			if (empty($hidelist))
 			{
@@ -4719,15 +5289,19 @@ 
 				} else {
 					$newfilter .= ' AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Customer discounts available
 				}
-				if ($filter) $newfilter .= ' AND ('.$filter.')';
+				if ($filter) {
+					$newfilter .= ' AND ('.$filter.')';
+				}
 				$nbqualifiedlines = $this->select_remises($selected, $htmlname, $newfilter, $socid, $maxvalue);
 				if ($nbqualifiedlines > 0)
 				{
 					print ' &nbsp; <input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"';
-					if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")
-						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
-					if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")
-						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
+					if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {
+											print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
+					}
+					if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {
+											print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
+					}
 
 					print '>';
 				}
@@ -4836,8 +5410,11 @@ 
 			}
 		}
 
-		if ($nooutput) return $out;
-		else print $out;
+		if ($nooutput) {
+			return $out;
+		} else {
+			print $out;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -4871,7 +5448,10 @@ 
 
 		$out = '';
 
-		if ($selected == 'euro' || $selected == 'euros') $selected = 'EUR'; // Pour compatibilite
+		if ($selected == 'euro' || $selected == 'euros') {
+			$selected = 'EUR';
+		}
+		// Pour compatibilite
 
 		$out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'" id="'.$htmlname.'">';
 		foreach ($langs->cache_currencies as $code_iso => $currency)
@@ -4892,7 +5472,9 @@ 
 			$out .= '</option>';
 		}
 		$out .= '</select>';
-		if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 
 		// Make select dynamic
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
@@ -4922,12 +5504,16 @@ 
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			while ($obj = $db->fetch_object($resql)) $TCurrency[$obj->code] = $obj->code;
+			while ($obj = $db->fetch_object($resql)) {
+				$TCurrency[$obj->code] = $obj->code;
+			}
 		}
 
 		$out = '';
 		$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-		if ($useempty) $out .= '<option value="">&nbsp;</option>';
+		if ($useempty) {
+			$out .= '<option value="">&nbsp;</option>';
+		}
 		// If company current currency not in table, we add it into list. Should always be available.
 		if (!in_array($conf->currency, $TCurrency))
 		{
@@ -4939,8 +5525,11 @@ 
 			{
 				if (isset($TCurrency[$code_iso]))
 				{
-					if (!empty($selected) && $selected == $code_iso) $out .= '<option value="'.$code_iso.'" selected="selected">';
-					else $out .= '<option value="'.$code_iso.'">';
+					if (!empty($selected) && $selected == $code_iso) {
+						$out .= '<option value="'.$code_iso.'" selected="selected">';
+					} else {
+						$out .= '<option value="'.$code_iso.'">';
+					}
 
 					$out .= $currency['label'];
 					$out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
@@ -4970,7 +5559,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_vatrates);
-		if ($num > 0) return $num; // Cache already loaded
+		if ($num > 0) {
+			return $num;
+		}
+		// Cache already loaded
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -5002,10 +5594,18 @@ 
 					$this->cache_vatrates[$i]['label'] = $obj->taux.'%'.($obj->code ? ' ('.$obj->code.')' : ''); // Label must contains only 0-9 , . % or *
 					$this->cache_vatrates[$i]['labelallrates'] = $obj->taux.'/'.($obj->localtax1 ? $obj->localtax1 : '0').'/'.($obj->localtax2 ? $obj->localtax2 : '0').($obj->code ? ' ('.$obj->code.')' : ''); // Must never be used as key, only label
 					$positiverates = '';
-					if ($obj->taux) $positiverates .= ($positiverates ? '/' : '').$obj->taux;
-					if ($obj->localtax1) $positiverates .= ($positiverates ? '/' : '').$obj->localtax1;
-					if ($obj->localtax2) $positiverates .= ($positiverates ? '/' : '').$obj->localtax2;
-					if (empty($positiverates)) $positiverates = '0';
+					if ($obj->taux) {
+						$positiverates .= ($positiverates ? '/' : '').$obj->taux;
+					}
+					if ($obj->localtax1) {
+						$positiverates .= ($positiverates ? '/' : '').$obj->localtax1;
+					}
+					if ($obj->localtax2) {
+						$positiverates .= ($positiverates ? '/' : '').$obj->localtax2;
+					}
+					if (empty($positiverates)) {
+						$positiverates = '0';
+					}
 					$this->cache_vatrates[$i]['labelpositiverates'] = $positiverates.($obj->code ? ' ('.$obj->code.')' : ''); // Must never be used as key, only label
 				}
 
@@ -5087,28 +5687,36 @@ 
 		} else {
 			$code_country = "'".$mysoc->country_code."'"; // Pour compatibilite ascendente
 		}
-		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))    // If option to have vat for end customer for services is on
+		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC)) {
+			// If option to have vat for end customer for services is on
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+		}
 			if (!isInEEC($societe_vendeuse) && (!is_object($societe_acheteuse) || (isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany())))
 			{
 				// We also add the buyer
 				if (is_numeric($type))
 				{
-					if ($type == 1) // We know product is a service
+					if ($type == 1) {
+						// We know product is a service
 					{
 						$code_country .= ",'".$societe_acheteuse->country_code."'";
 					}
-				} elseif (!$idprod)  // We don't know type of product
+					}
+				} elseif (!$idprod) {
+					// We don't know type of product
 				{
 					$code_country .= ",'".$societe_acheteuse->country_code."'";
+				}
 				} else {
 					$prodstatic = new Product($this->db);
 					$prodstatic->fetch($idprod);
-					if ($prodstatic->type == Product::TYPE_SERVICE)   // We know product is a service
+					if ($prodstatic->type == Product::TYPE_SERVICE) {
+						// We know product is a service
 					{
 						$code_country .= ",'".$societe_acheteuse->country_code."'";
 					}
+					}
 				}
 			}
 		}
@@ -5128,15 +5736,20 @@ 
 			        $defaultcode = $reg[1];
 			        $defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);
 		        }
-				if (empty($defaulttx)) $defaultnpr = 0;
+				if (empty($defaulttx)) {
+					$defaultnpr = 0;
+				}
 			}
 
 			// Si taux par defaut n'a pu etre determine, on prend dernier de la liste.
 			// Comme ils sont tries par ordre croissant, dernier = plus eleve = taux courant
 			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)
 			{
-				if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) $defaulttx = $this->cache_vatrates[$num - 1]['txtva'];
-				else $defaulttx = ($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS == 'none' ? '' : $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS);
+				if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {
+					$defaulttx = $this->cache_vatrates[$num - 1]['txtva'];
+				} else {
+					$defaulttx = ($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS == 'none' ? '' : $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS);
+				}
 			}
 
 			// Disabled if seller is not subject to VAT
@@ -5152,28 +5765,38 @@ 
 				}
 			}
 
-			if (!$options_only) $return .= '<select class="flat minwidth75imp" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled ? ' disabled' : '').$title.'>';
+			if (!$options_only) {
+				$return .= '<select class="flat minwidth75imp" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled ? ' disabled' : '').$title.'>';
+			}
 
 			$selectedfound = false;
 			foreach ($this->cache_vatrates as $rate)
 			{
 				// Keep only 0 if seller is not subject to VAT
-				if ($disabled && $rate['txtva'] != 0) continue;
+				if ($disabled && $rate['txtva'] != 0) {
+					continue;
+				}
 
 				// Define key to use into select list
 				$key = $rate['txtva'];
 				$key .= $rate['nprtva'] ? '*' : '';
-				if ($mode > 0 && $rate['code']) $key .= ' ('.$rate['code'].')';
-				if ($mode < 0) $key = $rate['rowid'];
+				if ($mode > 0 && $rate['code']) {
+					$key .= ' ('.$rate['code'].')';
+				}
+				if ($mode < 0) {
+					$key = $rate['rowid'];
+				}
 
 				$return .= '<option value="'.$key.'"';
 				if (!$selectedfound)
 				{
-					if ($defaultcode) // If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag
+					if ($defaultcode) {
+						// If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag
 					{
 						if ($defaultcode == $rate['code'])
 						{
 							$return .= ' selected';
+					}
 							$selectedfound = true;
 						}
 					} elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
@@ -5196,7 +5819,9 @@ 
 				$return .= '</option>';
 			}
 
-			if (!$options_only) $return .= '</select>';
+			if (!$options_only) {
+				$return .= '</select>';
+			}
 		} else {
 			$return .= $this->error;
 		}
@@ -5295,12 +5920,20 @@ 
 
 		$retstring = '';
 
-		if ($prefix == '') $prefix = 're';
-		if ($h == '') $h = 0;
-		if ($m == '') $m = 0;
+		if ($prefix == '') {
+			$prefix = 're';
+		}
+		if ($h == '') {
+			$h = 0;
+		}
+		if ($m == '') {
+			$m = 0;
+		}
 		$emptydate = 0;
 		$emptyhours = 0;
-        if ($stepminutes <= 0 || $stepminutes > 30) $stepminutes = 1;
+        if ($stepminutes <= 0 || $stepminutes > 30) {
+        	$stepminutes = 1;
+        }
 		if ($empty == 1) { $emptydate = 1; $emptyhours = 1; }
 		if ($empty == 2) { $emptydate = 0; $emptyhours = 1; }
 		$orig_set_time = $set_time;
@@ -5312,10 +5945,12 @@ 
 		}
 
 		// Analysis of the pre-selection date
-		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/', $set_time, $reg))	// deprecated usage
+		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/', $set_time, $reg)) {
+			// deprecated usage
 		{
 			// Date format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
 			$syear	= (!empty($reg[1]) ? $reg[1] : '');
+		}
 			$smonth = (!empty($reg[2]) ? $reg[2] : '');
 			$sday	= (!empty($reg[3]) ? $reg[3] : '');
 			$shour	= (!empty($reg[4]) ? $reg[4] : '');
@@ -5345,8 +5980,12 @@ 
 			$smin = !isset($conf->global->MAIN_DEFAULT_DATE_MIN) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_MIN;
 			$ssec = !isset($conf->global->MAIN_DEFAULT_DATE_SEC) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_SEC;
 		}
-		if ($h == 3) $shour = '';
-		if ($m == 3) $smin = '';
+		if ($h == 3) {
+			$shour = '';
+		}
+		if ($m == 3) {
+			$smin = '';
+		}
 
 		// You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
 		$usecalendar = 'combo';
@@ -5383,7 +6022,9 @@ 
 						$base = DOL_URL_ROOT.'/core/';
 						$retstring .= ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';
 						$retstring .= '>'.img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"').'</button>';
-					} else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+					} else {
+						$retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+					}
 
 					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
@@ -5503,7 +6144,9 @@ 
 			}
 		}
 
-		if ($d && $h) $retstring .= ($h == 2 ? '<br>' : ' ');
+		if ($d && $h) {
+			$retstring .= ($h == 2 ? '<br>' : ' ');
+		}
 
 		if ($h)
 		{
@@ -5513,28 +6156,40 @@ 
 				$openinghours = explode(',', $openinghours);
 				$hourstart = $openinghours[0];
 				$hourend = $openinghours[1];
-				if ($hourend < $hourstart) $hourend = $hourstart;
+				if ($hourend < $hourstart) {
+					$hourend = $hourstart;
+				}
 			}
 			// Show hour
 			$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50 '.($fullday ? $fullday.'hour' : '').'" id="'.$prefix.'hour" name="'.$prefix.'hour">';
-			if ($emptyhours) $retstring .= '<option value="-1">&nbsp;</option>';
+			if ($emptyhours) {
+				$retstring .= '<option value="-1">&nbsp;</option>';
+			}
 			for ($hour = $hourstart; $hour < $hourend; $hour++)
 			{
-				if (strlen($hour) < 2) $hour = "0".$hour;
+				if (strlen($hour) < 2) {
+					$hour = "0".$hour;
+				}
 				$retstring .= '<option value="'.$hour.'"'.(($hour == $shour) ? ' selected' : '').'>'.$hour.(empty($conf->dol_optimize_smallscreen) ? '' : 'H').'</option>';
 			}
 			$retstring .= '</select>';
-			if ($m && empty($conf->dol_optimize_smallscreen)) $retstring .= ":";
+			if ($m && empty($conf->dol_optimize_smallscreen)) {
+				$retstring .= ":";
+			}
 		}
 
 		if ($m)
 		{
 			// Show minutes
 			$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50 '.($fullday ? $fullday.'min' : '').'" id="'.$prefix.'min" name="'.$prefix.'min">';
-			if ($emptyhours) $retstring .= '<option value="-1">&nbsp;</option>';
+			if ($emptyhours) {
+				$retstring .= '<option value="-1">&nbsp;</option>';
+			}
 			for ($min = 0; $min < 60; $min += $stepminutes)
 			{
-				if (strlen($min) < 2) $min = "0".$min;
+				if (strlen($min) < 2) {
+					$min = "0".$min;
+				}
 				$retstring .= '<option value="'.$min.'"'.(($min == $smin) ? ' selected' : '').'>'.$min.(empty($conf->dol_optimize_smallscreen) ? '' : '').'</option>';
 			}
 			$retstring .= '</select>';
@@ -5547,7 +6202,8 @@ 
 		{
 			// Script which will be inserted in the onClick of the "Now" link
 			$reset_scripts = "";
-            if ($addnowlink == 2) // local computer time
+            if ($addnowlink == 2) {
+            	// local computer time
             {
                 // pad add leading 0 on numbers
                 $reset_scripts .= "Number.prototype.pad = function(size) {
@@ -5557,11 +6213,14 @@ 
                     };
                     var d = new Date();";
             }
+            }
 
 			// Generate the date part, depending on the use or not of the javascript calendar
-            if ($addnowlink == 1) // server time expressed in user time setup
+            if ($addnowlink == 1) {
+            	// server time expressed in user time setup
             {
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day', 'tzuser').'\');';
+            }
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';
@@ -5593,7 +6252,9 @@ 
 			// Update the hour part
 			if ($h)
 			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				if ($fullday) {
+					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				}
 				//$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';
                 if ($addnowlink == 1)
                 {
@@ -5603,12 +6264,16 @@ 
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(d.getHours().pad());';
                 }
 
-				if ($fullday) $reset_scripts .= ' } ';
+				if ($fullday) {
+					$reset_scripts .= ' } ';
+				}
 			}
 			// Update the minute part
 			if ($m)
 			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				if ($fullday) {
+					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				}
 				//$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';
                 if ($addnowlink == 1)
                 {
@@ -5617,7 +6282,9 @@ 
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(d.getMinutes().pad());';
                 }
-				if ($fullday) $reset_scripts .= ' } ';
+				if ($fullday) {
+					$reset_scripts .= ' } ';
+				}
 			}
 			// If reset_scripts is not empty, print the link with the reset_scripts in the onClick
 			if ($reset_scripts && empty($conf->dol_optimize_smallscreen))
@@ -5642,16 +6309,24 @@ 
 			// Update the hour part
 			if ($h)
 			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				if ($fullday) {
+					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				}
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H').'\');';
-				if ($fullday) $reset_scripts .= ' } ';
+				if ($fullday) {
+					$reset_scripts .= ' } ';
+				}
 			}
 			// Update the minute part
 			if ($m)
 			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				if ($fullday) {
+					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				}
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M').'\');';
-				if ($fullday) $reset_scripts .= ' } ';
+				if ($fullday) {
+					$reset_scripts .= ' } ';
+				}
 			}
 			// If reset_scripts is not empty, print the link with the reset_scripts in the onClick
 			if ($reset_scripts && empty($conf->dol_optimize_smallscreen))
@@ -5666,7 +6341,9 @@ 
 		if ($conf->use_javascript_ajax && $adddateof)
 		{
 			$tmparray = dol_getdate($adddateof);
-			if (empty($labeladddateof)) $labeladddateof = $langs->trans("DateInvoice");
+			if (empty($labeladddateof)) {
+				$labeladddateof = $langs->trans("DateInvoice");
+			}
 			$retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="jQuery(\'#re\').val(\''.dol_print_date($adddateof, 'day').'\');jQuery(\'#reday\').val(\''.$tmparray['mday'].'\');jQuery(\'#remonth\').val(\''.$tmparray['mon'].'\');jQuery(\'#reyear\').val(\''.$tmparray['year'].'\');">'.$labeladddateof.'</a>';
 		}
 
@@ -5707,9 +6384,11 @@ 
 
 		if ($typehour == 'select') {
 			$retstring .= '<select class="flat" id="select_'.$prefix.'hour" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').'>';
-			for ($hour = 0; $hour < 25; $hour++)	// For a duration, we allow 24 hours
+			for ($hour = 0; $hour < 25; $hour++) {
+				// For a duration, we allow 24 hours
 			{
 				$retstring .= '<option value="'.$hour.'"';
+			}
 				if ($hourSelected == $hour)
 				{
 					$retstring .= " selected";
@@ -5723,12 +6402,18 @@ 
 			return 'BadValueForParameterTypeHour';
 		}
 
-		if ($typehour != 'text') $retstring .= ' '.$langs->trans('HourShort');
-		else $retstring .= '<span class="hideonsmartphone">:</span>';
+		if ($typehour != 'text') {
+			$retstring .= ' '.$langs->trans('HourShort');
+		} else {
+			$retstring .= '<span class="hideonsmartphone">:</span>';
+		}
 
 		// Minutes
-		if ($minunderhours) $retstring .= '<br>';
-		else $retstring .= '<span class="hideonsmartphone">&nbsp;</span>';
+		if ($minunderhours) {
+			$retstring .= '<br>';
+		} else {
+			$retstring .= '<span class="hideonsmartphone">&nbsp;</span>';
+		}
 
 		if ($typehour == 'select' || $typehour == 'textselect')
 		{
@@ -5736,7 +6421,9 @@ 
 			for ($min = 0; $min <= 55; $min = $min + 5)
 			{
 				$retstring .= '<option value="'.$min.'"';
-				if ($minSelected == $min) $retstring .= ' selected';
+				if ($minSelected == $min) {
+					$retstring .= ' selected';
+				}
 				$retstring .= '>'.$min.'</option>';
 			}
 			$retstring .= "</select>";
@@ -5745,11 +6432,15 @@ 
 			$retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';
 		}
 
-		if ($typehour != 'text') $retstring .= ' '.$langs->trans('MinuteShort');
+		if ($typehour != 'text') {
+			$retstring .= ' '.$langs->trans('MinuteShort');
+		}
 
 		//$retstring.="&nbsp;";
 
-		if (!empty($nooutput)) return $retstring;
+		if (!empty($nooutput)) {
+			return $retstring;
+		}
 
 		print $retstring;
 		return;
@@ -5809,8 +6500,12 @@ 
 
 		//var_dump($objecttmp->filter);
 		$prefixforautocompletemode = $objecttmp->element;
-		if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode = 'company';
-		if ($prefixforautocompletemode == 'product') $prefixforautocompletemode = 'produit';
+		if ($prefixforautocompletemode == 'societe') {
+			$prefixforautocompletemode = 'company';
+		}
+		if ($prefixforautocompletemode == 'product') {
+			$prefixforautocompletemode = 'produit';
+		}
 		$confkeyforautocompletemode = strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT
 
 		dol_syslog(get_class($this)."::selectForForms object->filter=".$objecttmp->filter, LOG_DEBUG);
@@ -5834,7 +6529,9 @@ 
 			// Activate the auto complete using ajax call.
 			$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
-			if ($placeholder) $placeholder = ' placeholder="'.$placeholder.'"';
+			if ($placeholder) {
+				$placeholder = ' placeholder="'.$placeholder.'"';
+			}
 			$out .= '<input type="text" class="'.$morecss.'"'.($disabled ? ' disabled="disabled"' : '').' name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
 		} else {
 			// Immediate load of table record. Note: filter is inside $objecttmp->filter
@@ -5855,9 +6552,13 @@ 
 		global $db;
 
 		//dol_syslog("Convert matches ".$matches[1]);
-		if (empty($matches[1])) return '';
+		if (empty($matches[1])) {
+			return '';
+		}
 		$tmp = explode(':', $matches[1]);
-		if (count($tmp) < 3) return '';
+		if (count($tmp) < 3) {
+			return '';
+		}
 
 		$tmpescaped = $tmp[2];
 		$regbis = array();
@@ -5895,17 +6596,25 @@ 
 		//print "$objecttmp->filter, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled";
 
 		$prefixforautocompletemode = $objecttmp->element;
-		if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode = 'company';
+		if ($prefixforautocompletemode == 'societe') {
+			$prefixforautocompletemode = 'company';
+		}
 		$confkeyforautocompletemode = strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT
 
-		if (!empty($objecttmp->fields))	// For object that declare it, it is better to use declared fields (like societe, contact, ...)
+		if (!empty($objecttmp->fields)) {
+			// For object that declare it, it is better to use declared fields (like societe, contact, ...)
 		{
 			$tmpfieldstoshow = '';
+		}
 			foreach ($objecttmp->fields as $key => $val)
 			{
-				if ($val['showoncombobox']) $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;
+				if ($val['showoncombobox']) {
+					$tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;
+				}
+			}
+			if ($tmpfieldstoshow) {
+				$fieldstoshow = $tmpfieldstoshow;
 			}
-			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
 		} else {
 			// For backward compatibility
 			$objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1);
@@ -5933,20 +6642,30 @@ 
 			$tmparray = explode('@', $objecttmp->ismultientitymanaged);
 			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON parenttable.rowid = t.'.$tmparray[0];
 		}
-		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe')
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {
+					if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE 1=1";
-		if (isset($objecttmp->ismultientitymanaged) && $objecttmp->ismultientitymanaged == 1) $sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
+		if (isset($objecttmp->ismultientitymanaged) && $objecttmp->ismultientitymanaged == 1) {
+			$sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
+		}
 		if (isset($objecttmp->ismultientitymanaged) && !is_numeric($objecttmp->ismultientitymanaged)) {
 			$sql .= ' AND parenttable.entity = t.'.$tmparray[0];
 		}
 		if ($objecttmp->ismultientitymanaged == 1 && !empty($user->socid)) {
-			if ($objecttmp->element == 'societe') $sql .= " AND t.rowid = ".$user->socid;
-			else $sql .= " AND t.fk_soc = ".$user->socid;
+			if ($objecttmp->element == 'societe') {
+				$sql .= " AND t.rowid = ".$user->socid;
+			} else {
+				$sql .= " AND t.fk_soc = ".$user->socid;
+			}
+		}
+		if ($searchkey != '') {
+			$sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
 		}
-		if ($searchkey != '') $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
 		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
 		}
 		if ($objecttmp->filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 			/*if (! DolibarrApi::_checkFilters($objecttmp->filter))
@@ -5979,10 +6698,15 @@ 
 			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
 			if (!empty($conf->global->$confkeyforautocompletemode))
 			{
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
-				else $textifempty .= $langs->trans("All");
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				} else {
+					$textifempty .= $langs->trans("All");
+				}
+			}
+			if ($showempty) {
+				$out .= '<option value="-1">'.$textifempty.'</option>'."\n";
 			}
-			if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -6011,7 +6735,9 @@ 
 					}
 
 					$i++;
-					if (($i % 10) == 0) $out .= "\n";
+					if (($i % 10) == 0) {
+						$out .= "\n";
+					}
 				}
 			}
 
@@ -6022,7 +6748,9 @@ 
 
 		$this->result = array('nbofelement'=>$num);
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -6059,7 +6787,9 @@ 
 		//if (preg_match('/^multi/',$htmlname)) $jsbeautify = 1;
 		$jsbeautify = 1;
 
-		if ($value_as_key) $array = array_combine($array, $array);
+		if ($value_as_key) {
+			$array = array_combine($array, $array);
+		}
 
 		$out = '';
 
@@ -6081,8 +6811,13 @@ 
 		if ($show_empty)
 		{
 			$textforempty = ' ';
-			if (!empty($conf->use_javascript_ajax)) $textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
-			if (!is_numeric($show_empty)) $textforempty = $show_empty;
+			if (!empty($conf->use_javascript_ajax)) {
+				$textforempty = '&nbsp;';
+			}
+			// If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
+			if (!is_numeric($show_empty)) {
+				$textforempty = $show_empty;
+			}
 			$out .= '<option class="optiongrey" '.($moreparamonempty ? $moreparamonempty.' ' : '').'value="'.($show_empty < 0 ? $show_empty : -1).'"'.($id == $show_empty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";
 		}
 
@@ -6093,19 +6828,28 @@ 
 			{
 				foreach ($array as $key => $value)
 				{
-				    if (!is_array($value)) $array[$key] = $langs->trans($value);
-				    else $array[$key]['label'] = $langs->trans($value['label']);
+				    if (!is_array($value)) {
+				    	$array[$key] = $langs->trans($value);
+				    } else {
+				    	$array[$key]['label'] = $langs->trans($value['label']);
+				    }
 				}
 			}
 
 			// Sort
-			if ($sort == 'ASC') asort($array);
-			elseif ($sort == 'DESC') arsort($array);
+			if ($sort == 'ASC') {
+				asort($array);
+			} elseif ($sort == 'DESC') {
+				arsort($array);
+			}
 
 			foreach ($array as $key => $tmpvalue)
 			{
-			    if (is_array($tmpvalue)) $value = $tmpvalue['label'];
-			    else $value = $tmpvalue;
+			    if (is_array($tmpvalue)) {
+			    	$value = $tmpvalue['label'];
+			    } else {
+			    	$value = $tmpvalue;
+			    }
 
 				$disabled = ''; $style = '';
 				if (!empty($disablebademail))
@@ -6120,28 +6864,46 @@ 
 
 				if ($key_in_label)
 				{
-					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value));
-					else $selectOptionValue = $key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value);
+					if (empty($nohtmlescape)) {
+						$selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value));
+					} else {
+						$selectOptionValue = $key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value);
+					}
 				} else {
-					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($maxlen ?dol_trunc($value, $maxlen) : $value);
-					else $selectOptionValue = $maxlen ?dol_trunc($value, $maxlen) : $value;
-					if ($value == '' || $value == '-') $selectOptionValue = '&nbsp;';
+					if (empty($nohtmlescape)) {
+						$selectOptionValue = dol_escape_htmltag($maxlen ?dol_trunc($value, $maxlen) : $value);
+					} else {
+						$selectOptionValue = $maxlen ?dol_trunc($value, $maxlen) : $value;
+					}
+					if ($value == '' || $value == '-') {
+						$selectOptionValue = '&nbsp;';
+					}
 				}
 
 				$out .= '<option value="'.$key.'"';
 				$out .= $style.$disabled;
 				if (is_array($id)) {
-					if (in_array($key, $id) && !$disabled) $out .= ' selected'; // To preselect a value
+					if (in_array($key, $id) && !$disabled) {
+						$out .= ' selected';
+					}
+					// To preselect a value
 				} else {
 					$id = (string) $id; // if $id = 0, then $id = '0'
-					if ($id != '' && $id == $key && !$disabled) $out .= ' selected'; // To preselect a value
+					if ($id != '' && $id == $key && !$disabled) {
+						$out .= ' selected';
+					}
+					// To preselect a value
+				}
+				if ($nohtmlescape) {
+					$out .= ' data-html="'.dol_escape_htmltag($selectOptionValue).'"';
 				}
-				if ($nohtmlescape) $out .= ' data-html="'.dol_escape_htmltag($selectOptionValue).'"';
 				if (is_array($tmpvalue))
 				{
 				    foreach ($tmpvalue as $keyforvalue => $valueforvalue)
 				    {
-				        if (preg_match('/^data-/', $keyforvalue)) $out .= ' '.$keyforvalue.'="'.$valueforvalue.'"';
+				        if (preg_match('/^data-/', $keyforvalue)) {
+				        	$out .= ' '.$keyforvalue.'="'.$valueforvalue.'"';
+				        }
 				    }
 				}
 				$out .= '>';
@@ -6180,7 +6942,9 @@ 
 		global $delayedhtmlcontent;
 
 		// TODO Use an internal dolibarr component instead of select2
-		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) return '';
+		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+			return '';
+		}
 
 		$out = '<select type="text" class="'.$htmlname.($morecss ? ' '.$morecss : '').'" '.($moreparam ? $moreparam.' ' : '').'name="'.$htmlname.'"></select>';
 
@@ -6280,7 +7044,9 @@ 
 		global $delayedhtmlcontent;
 
 		// TODO Use an internal dolibarr component instead of select2
-		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) return '';
+		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+			return '';
+		}
 
 		$out = '<select type="text" class="'.$htmlname.($morecss ? ' '.$morecss : '').'" '.($moreparam ? $moreparam.' ' : '').'name="'.$htmlname.'"><option></option></select>';
 
@@ -6397,8 +7163,11 @@ 
 		$out = '';
 
 		if ($addjscombo < 0) {
-		    if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $addjscombo = 1;
-		    else $addjscombo = 0;
+		    if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		    	$addjscombo = 1;
+		    } else {
+		    	$addjscombo = 0;
+		    }
 		}
 
 		// Add code for jquery to use multiselect
@@ -6459,7 +7228,9 @@ 
 		$out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss ? ' '.$morecss : '').'" multiple name="'.$htmlname.'[]"'.($moreattrib ? ' '.$moreattrib : '').($width ? ' style="width: '.(preg_match('/%/', $width) ? $width : $width.'px').'"' : '').'>'."\n";
 		if (is_array($array) && !empty($array))
 		{
-			if ($value_as_key) $array = array_combine($array, $array);
+			if ($value_as_key) {
+				$array = array_combine($array, $array);
+			}
 
 			if (!empty($array))
 			{
@@ -6498,7 +7269,9 @@ 
 	{
 		global $conf, $langs, $user;
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
+		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			return '';
+		}
 
 		$tmpvar = "MAIN_SELECTEDFIELDS_".$varpage;	// To get list of saved seleteced properties
 		if (!empty($user->conf->$tmpvar))
@@ -6508,8 +7281,11 @@ 
 			{
 				//var_dump($key);
 				//var_dump($tmparray);
-				if (in_array($key, $tmparray)) $array[$key]['checked'] = 1;
-				else $array[$key]['checked'] = 0;
+				if (in_array($key, $tmparray)) {
+					$array[$key]['checked'] = 1;
+				} else {
+					$array[$key]['checked'] = 0;
+				}
 			}
 		}
 
@@ -6691,25 +7467,46 @@ 
 				// To work with non standard path
 				if ($objecttype == 'facture') {
 					$tplpath = 'compta/'.$element;
-					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->facture->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'facturerec') {
 					$tplpath = 'compta/facture';
 					$tplname = 'linkedobjectblockForRec';
-					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->facture->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'propal') {
 					$tplpath = 'comm/'.$element;
-					if (empty($conf->propal->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->propal->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'supplier_proposal') {
-					if (empty($conf->supplier_proposal->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->supplier_proposal->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
 					$tplpath = 'expedition';
-					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->expedition->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'reception') {
         			$tplpath = 'reception';
-        			if (empty($conf->reception->enabled)) continue; // Do not show if module disabled
+        			if (empty($conf->reception->enabled)) {
+        				continue;
+        			}
+        			// Do not show if module disabled
         		} elseif ($objecttype == 'delivery') {
 					$tplpath = 'livraison';
-					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
+					if (empty($conf->expedition->enabled)) {
+						continue;
+					}
+					// Do not show if module disabled
 				} elseif ($objecttype == 'invoice_supplier') {
 					$tplpath = 'fourn/facture';
 				} elseif ($objecttype == 'order_supplier') {
@@ -6728,9 +7525,11 @@ 
 				$dirtpls = array_merge($conf->modules_parts['tpl'], array('/'.$tplpath.'/tpl'));
 				foreach ($dirtpls as $reldir)
 				{
-					if ($nboftypesoutput == ($nbofdifferenttypes - 1))    // No more type to show after
+					if ($nboftypesoutput == ($nbofdifferenttypes - 1)) {
+						// No more type to show after
 					{
 						global $noMoreLinkedObjectBlockAfter;
+					}
 						$noMoreLinkedObjectBlockAfter = 1;
 					}
 
@@ -6779,19 +7578,25 @@ 
 		$linktoelemlist = '';
 		$listofidcompanytoscan = '';
 
-		if (!is_object($object->thirdparty)) $object->fetch_thirdparty();
+		if (!is_object($object->thirdparty)) {
+			$object->fetch_thirdparty();
+		}
 
 		$possiblelinks = array();
 		if (is_object($object->thirdparty) && !empty($object->thirdparty->id) && $object->thirdparty->id > 0)
 		{
 			$listofidcompanytoscan = $object->thirdparty->id;
-			if (($object->thirdparty->parent > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) $listofidcompanytoscan .= ','.$object->thirdparty->parent;
+			if (($object->thirdparty->parent > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) {
+				$listofidcompanytoscan .= ','.$object->thirdparty->parent;
+			}
 			if (($object->fk_project > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$tmpproject = new Project($this->db);
 				$tmpproject->fetch($object->fk_project);
-				if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id)) $listofidcompanytoscan .= ','.$tmpproject->socid;
+				if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id)) {
+					$listofidcompanytoscan .= ','.$tmpproject->socid;
+				}
 				unset($tmpproject);
 			}
 
@@ -6814,9 +7619,12 @@ 
 		$hookmanager->initHooks(array('commonobject'));
 		$parameters = array('listofidcompanytoscan' => $listofidcompanytoscan);
 
-		if (!empty($listofidcompanytoscan))  // If empty, we don't have criteria to scan the object we can link to
+		if (!empty($listofidcompanytoscan)) {
+			// If empty, we don't have criteria to scan the object we can link to
 		{
-            $reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+            $reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action);
+		}
+		// Note that $action and $object may have been modified by hook
 		}
 
 		if (empty($reshook))
@@ -6837,7 +7645,9 @@ 
 		{
 			$num = 0;
 
-			if (empty($possiblelink['enabled'])) continue;
+			if (empty($possiblelink['enabled'])) {
+				continue;
+			}
 
 			if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto)))
 			{
@@ -6893,9 +7703,13 @@ 
 				}
 
 				//$linktoelem.=($linktoelem?' &nbsp; ':'');
-				if ($num > 0) $linktoelemlist .= '<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">'.$langs->trans($possiblelink['label']).' ('.$num.')</a></li>';
+				if ($num > 0) {
+					$linktoelemlist .= '<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">'.$langs->trans($possiblelink['label']).' ('.$num.')</a></li>';
+				}
 				//else $linktoelem.=$langs->trans($possiblelink['label']);
-				else $linktoelemlist .= '<li><span class="linktodisabled">'.$langs->trans($possiblelink['label']).' (0)</span></li>';
+				else {
+					$linktoelemlist .= '<li><span class="linktodisabled">'.$langs->trans($possiblelink['label']).' (0)</span></li>';
+				}
 			}
 		}
 
@@ -6904,7 +7718,9 @@ 
 			$linktoelem = '
     		<dl class="dropdown" id="linktoobjectname">
     		';
-			if (!empty($conf->use_javascript_ajax)) $linktoelem .= '<dt><a href="#linktoobjectname">'.$langs->trans("LinkTo").'...</a></dt>';
+			if (!empty($conf->use_javascript_ajax)) {
+				$linktoelem .= '<dt><a href="#linktoobjectname">'.$langs->trans("LinkTo").'...</a></dt>';
+			}
 			$linktoelem .= '<dd>
     		<div class="multiselectlinkto">
     		<ul class="ulselectedfields">'.$linktoelemlist.'
@@ -6957,7 +7773,9 @@ 
 		$disabled = ($disabled ? ' disabled' : '');
 
 		$resultyesno = '<select class="flat width75" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
-		if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";
+		if ($useempty) {
+			$resultyesno .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";
+		}
 		if (("$value" == 'yes') || ($value == 1))
 		{
 			$resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
@@ -7041,8 +7859,12 @@ 
 		global $langs, $conf, $hookmanager, $extralanguages;
 
 		$ret = '';
-		if (empty($fieldid))  $fieldid = 'rowid';
-		if (empty($fieldref)) $fieldref = 'ref';
+		if (empty($fieldid)) {
+			$fieldid = 'rowid';
+		}
+		if (empty($fieldref)) {
+			$fieldref = 'ref';
+		}
 
 		// Add where from hooks
 		if (is_object($hookmanager))
@@ -7061,9 +7883,11 @@ 
 			// Special case for project/task page
 			if ($paramid == 'project_ref')
 			{
-			    if (preg_match('/\/tasks\/(task|contact|note|document)\.php/', $navurl))     // TODO Remove this when nav with project_ref on task pages are ok
+			    if (preg_match('/\/tasks\/(task|contact|note|document)\.php/', $navurl)) {
+			    	// TODO Remove this when nav with project_ref on task pages are ok
 			    {
 				    $navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/', '/tasks.php', $navurl);
+			    }
     				$paramid = 'ref';
 			    }
 			}
@@ -7089,7 +7913,9 @@ 
 		$ret .= '<!-- Start banner content --><div style="vertical-align: middle">';
 
 		// Right part of banner
-		if ($morehtmlright) $ret .= '<div class="inline-block floatleft">'.$morehtmlright.'</div>';
+		if ($morehtmlright) {
+			$ret .= '<div class="inline-block floatleft">'.$morehtmlright.'</div>';
+		}
 
 		if ($previous_ref || $next_ref || $morehtml)
 		{
@@ -7111,20 +7937,33 @@ 
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $morehtmlstatus .= $hookmanager->resPrint;
-		else $morehtmlstatus = $hookmanager->resPrint;
-		if ($morehtmlstatus) $ret .= '<div class="statusref">'.$morehtmlstatus.'</div>';
+		if (empty($reshook)) {
+			$morehtmlstatus .= $hookmanager->resPrint;
+		} else {
+			$morehtmlstatus = $hookmanager->resPrint;
+		}
+		if ($morehtmlstatus) {
+			$ret .= '<div class="statusref">'.$morehtmlstatus.'</div>';
+		}
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('moreHtmlRef', $parameters, $object); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $morehtmlref .= $hookmanager->resPrint;
-		elseif ($reshook > 0) $morehtmlref = $hookmanager->resPrint;
+		if (empty($reshook)) {
+			$morehtmlref .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$morehtmlref = $hookmanager->resPrint;
+		}
 
 		// Left part of banner
 		if ($morehtmlleft)
 		{
-			if ($conf->browser->layout == 'phone') $ret .= '<!-- morehtmlleft --><div class="floatleft">'.$morehtmlleft.'</div>'; // class="center" to have photo in middle
-			else $ret .= '<!-- morehtmlleft --><div class="inline-block floatleft">'.$morehtmlleft.'</div>';
+			if ($conf->browser->layout == 'phone') {
+				$ret .= '<!-- morehtmlleft --><div class="floatleft">'.$morehtmlleft.'</div>';
+			}
+			// class="center" to have photo in middle
+			else {
+				$ret .= '<!-- morehtmlleft --><div class="inline-block floatleft">'.$morehtmlleft.'</div>';
+			}
 		}
 
 		//if ($conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>';
@@ -7137,7 +7976,9 @@ 
 
 			// List of extra languages
 			$arrayoflangcode = array();
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) $arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) {
+				$arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+			}
 
 			if (is_array($arrayoflangcode) && count($arrayoflangcode)) {
 				if (!is_object($extralanguages)) {
@@ -7221,14 +8062,18 @@ 
 		global $conf;
 
 		//Check if barcode is filled in the card
-		if (empty($object->barcode)) return '';
+		if (empty($object->barcode)) {
+			return '';
+		}
 
 		// Complete object if not complete
 		if (empty($object->barcode_type_code) || empty($object->barcode_type_coder))
 		{
 			$result = $object->fetch_barcode();
 			//Check if fetch_barcode() failed
-			if ($result < 1) return '<!-- ErrorFetchBarcode -->';
+			if ($result < 1) {
+				return '<!-- ErrorFetchBarcode -->';
+			}
 		}
 
 		// Barcode image
@@ -7266,9 +8111,15 @@ 
 			$dir = $conf->societe->multidir_output[$entity];
 			if (!empty($object->logo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
+				if ((string) $imagesize == 'mini') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_mini');
+				}
+				// getImageFileNameForSize include the thumbs
+				elseif ((string) $imagesize == 'small') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_small');
+				} else {
+					$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
+				}
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
 			}
 			$email = $object->email;
@@ -7277,9 +8128,13 @@ 
 			$dir = $conf->societe->multidir_output[$entity].'/contact';
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
+				if ((string) $imagesize == 'mini') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_mini');
+				} elseif ((string) $imagesize == 'small') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_small');
+				} else {
+					$file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
+				}
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
 			}
 			$email = $object->email;
@@ -7289,12 +8144,19 @@ 
 			$dir = $conf->user->dir_output;
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
+				if ((string) $imagesize == 'mini') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');
+				} elseif ((string) $imagesize == 'small') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');
+				} else {
+					$file = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
+				}
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
 			}
-			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
+			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+				$altfile = $object->id.".jpg";
+			}
+			// For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
 		} elseif ($modulepart == 'memberphoto')
@@ -7302,12 +8164,19 @@ 
 			$dir = $conf->adherent->dir_output;
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
+				if ((string) $imagesize == 'mini') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
+				} elseif ((string) $imagesize == 'small') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');
+				} else {
+					$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
+				}
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
 			}
-			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
+			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+				$altfile = $object->id.".jpg";
+			}
+			// For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
 		} else {
@@ -7315,16 +8184,25 @@ 
 			$dir = $conf->$modulepart->dir_output;
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
+				if ((string) $imagesize == 'mini') {
+					$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');
+				} elseif ((string) $imagesize == 'small') {
+					$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');
+				} else {
+					$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
+				}
 				$originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
 			}
-			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
+			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+				$altfile = $object->id.".jpg";
+			}
+			// For backward compatibility
 			$email = $object->email;
 		}
 
-		if ($forcecapture) $capture = $forcecapture;
+		if ($forcecapture) {
+			$capture = $forcecapture;
+		}
 
 		if ($dir)
 		{
@@ -7333,31 +8211,47 @@ 
 				if ($addlinktofullsize)
 				{
 					$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);
-					if ($urladvanced) $ret .= '<a href="'.$urladvanced.'">';
-					else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+					if ($urladvanced) {
+						$ret .= '<a href="'.$urladvanced.'">';
+					} else {
+						$ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+					}
 				}
 				$ret .= '<img alt="Photo" class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').' photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
-				if ($addlinktofullsize) $ret .= '</a>';
+				if ($addlinktofullsize) {
+					$ret .= '</a>';
+				}
 			} elseif ($altfile && file_exists($dir."/".$altfile))
 			{
 				if ($addlinktofullsize)
 				{
 					$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);
-					if ($urladvanced) $ret .= '<a href="'.$urladvanced.'">';
-					else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+					if ($urladvanced) {
+						$ret .= '<a href="'.$urladvanced.'">';
+					} else {
+						$ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+					}
 				}
 				$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" class="'.$cssclass.'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
-				if ($addlinktofullsize) $ret .= '</a>';
+				if ($addlinktofullsize) {
+					$ret .= '</a>';
+				}
 			} else {
 				$nophoto = '/public/theme/common/nophoto.png';
-				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto')))	// For module that are "physical" users
+				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto'))) {
+					// For module that are "physical" users
 				{
 					if ($modulepart == 'memberphoto' && strpos($object->morphy, 'mor') !== false) {
 						$nophoto = '/public/theme/common/company.png';
+				}
 					} else {
 						$nophoto = '/public/theme/common/user_anonymous.png';
-						if ($object->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
-						if ($object->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
+						if ($object->gender == 'man') {
+							$nophoto = '/public/theme/common/user_man.png';
+						}
+						if ($object->gender == 'woman') {
+							$nophoto = '/public/theme/common/user_woman.png';
+						}
 					}
 				}
 
@@ -7378,13 +8272,19 @@ 
 
 			if ($caneditfield)
 			{
-				if ($object->photo) $ret .= "<br>\n";
+				if ($object->photo) {
+					$ret .= "<br>\n";
+				}
 				$ret .= '<table class="nobordernopadding centpercent">';
-				if ($object->photo) $ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+				if ($object->photo) {
+					$ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+				}
 				$ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput" accept="image/*"'.($capture ? ' capture="'.$capture.'"' : '').'></td></tr>';
 				$ret .= '</table>';
 			}
-		} else dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
+		} else {
+			dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
+		}
 
 		return $ret;
 	}
@@ -7412,11 +8312,17 @@ 
 		global $conf, $user, $langs;
 
 		// Permettre l'exclusion de groupes
-		if (is_array($exclude))	$excludeGroups = implode("','", $exclude);
+		if (is_array($exclude)) {
+			$excludeGroups = implode("','", $exclude);
+		}
 		// Permettre l'inclusion de groupes
-		if (is_array($include))	$includeGroups = implode("','", $include);
+		if (is_array($include)) {
+			$includeGroups = implode("','", $include);
+		}
 
-		if (!is_array($selected)) $selected = array($selected);
+		if (!is_array($selected)) {
+			$selected = array($selected);
+		}
 
 		$out = '';
 
@@ -7430,13 +8336,20 @@ 
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";
-			if ($force_entity) $sql .= " WHERE ug.entity IN (0,".$force_entity.")";
-			else $sql .= " WHERE ug.entity IS NOT NULL";
+			if ($force_entity) {
+				$sql .= " WHERE ug.entity IN (0,".$force_entity.")";
+			} else {
+				$sql .= " WHERE ug.entity IS NOT NULL";
+			}
 		} else {
 			$sql .= " WHERE ug.entity IN (0,".$conf->entity.")";
 		}
-		if (is_array($exclude) && $excludeGroups) $sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";
-		if (is_array($include) && $includeGroups) $sql .= " AND ug.rowid IN ('".$includeGroups."')";
+		if (is_array($exclude) && $excludeGroups) {
+			$sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";
+		}
+		if (is_array($include) && $includeGroups) {
+			$sql .= " AND ug.rowid IN ('".$includeGroups."')";
+		}
 		$sql .= " ORDER BY ug.nom ASC";
 
 		dol_syslog(get_class($this)."::select_dolgroups", LOG_DEBUG);
@@ -7453,16 +8366,22 @@ 
 			$i = 0;
 			if ($num)
 			{
-				if ($show_empty && !$multiple) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>&nbsp;</option>'."\n";
+				if ($show_empty && !$multiple) {
+					$out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>&nbsp;</option>'."\n";
+				}
 
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
 					$disableline = 0;
-					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) $disableline = 1;
+					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {
+						$disableline = 1;
+					}
 
 					$out .= '<option value="'.$obj->rowid.'"';
-					if ($disableline) $out .= ' disabled';
+					if ($disableline) {
+						$out .= ' disabled';
+					}
 					if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && in_array($obj->rowid, $selected)))
 					{
 						$out .= ' selected';
@@ -7479,7 +8398,9 @@ 
 					$i++;
 				}
 			} else {
-				if ($show_empty) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";
+				if ($show_empty) {
+					$out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";
+				}
 				$out .= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';
 			}
 			$out .= '</select>';
@@ -7520,7 +8441,9 @@ 
 
 		$out = '';
 		$id = uniqid();
-                if (!empty($conf->use_javascript_ajax)) $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="' . $cssclass . 's" name="' . $cssclass . 's" class="checkallactions"></div>';
+                if (!empty($conf->use_javascript_ajax)) {
+                	$out .= '<div class="inline-block checkallactions"><input type="checkbox" id="' . $cssclass . 's" name="' . $cssclass . 's" class="checkallactions"></div>';
+                }
 		$out .= '<script>
             $(document).ready(function() {
                 $("#' . $cssclass . 's").click(function() {
@@ -7533,7 +8456,9 @@ 
                         console.log("We uncheck all");
                 		$(".'.$cssclass.'").prop(\'checked\', false).trigger(\'change\');
                     }'."\n";
-                if ($calljsfunction) $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0, "' . $massactionname . '", "' . $cssclass . '"); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+                if ($calljsfunction) {
+                	$out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0, "' . $massactionname . '", "' . $cssclass . '"); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+                }
 		$out .= '         });
 
                 $(".' . $cssclass . '").change(function() {
@@ -7584,21 +8509,27 @@ 
         $out = '';
         $sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
 		$sql .= ' AND entity IN (0,'.getEntity('exp_tax_cat').')';
-		if (!empty($excludeid)) $sql .= ' AND rowid NOT IN ('.implode(',', $excludeid).')';
+		if (!empty($excludeid)) {
+			$sql .= ' AND rowid NOT IN ('.implode(',', $excludeid).')';
+		}
 		$sql .= ' ORDER BY label';
 
 		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
-			if ($useempty) $out .= '<option value="0">&nbsp;</option>';
+			if ($useempty) {
+				$out .= '<option value="0">&nbsp;</option>';
+			}
 
 			while ($obj = $db->fetch_object($resql))
 			{
 				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.$langs->trans($obj->label).'</option>';
 			}
 			$out .= '</select>';
-			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if (!empty($htmlname) && $user->admin) {
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 
 			if (!empty($target))
 			{
@@ -7614,7 +8545,9 @@ 
 								$("select[name='.$target.']").on("change", function() {
 									var current_val = $(this).val();
 									if (current_val == '.$obj->id.') {';
-						if (!empty($default_selected) || !empty($selected)) $out .= '$("select[name='.$htmlname.']").val("'.($default_selected > 0 ? $default_selected : $selected).'");';
+						if (!empty($default_selected) || !empty($selected)) {
+							$out .= '$("select[name='.$htmlname.']").val("'.($default_selected > 0 ? $default_selected : $selected).'");';
+						}
 
 						$out .= '
 										$("select[name='.$htmlname.']").change();
@@ -7677,7 +8610,9 @@ 
 		if ($resql)
 		{
 			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
-			if ($useempty) $out .= '<option value="0"></option>';
+			if ($useempty) {
+				$out .= '<option value="0"></option>';
+			}
 
 			while ($obj = $db->fetch_object($resql))
 			{
@@ -7713,11 +8648,17 @@ 
 		if ($resql)
 		{
 			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
-			if ($useempty) $out .= '<option value="0"></option>';
-			if ($allchoice) $out .= '<option value="-1">'.$langs->trans('AllExpenseReport').'</option>';
+			if ($useempty) {
+				$out .= '<option value="0"></option>';
+			}
+			if ($allchoice) {
+				$out .= '<option value="-1">'.$langs->trans('AllExpenseReport').'</option>';
+			}
 
 			$field = 'code';
-			if ($useid) $field = 'id';
+			if ($useid) {
+				$field = 'id';
+			}
 
 			while ($obj = $db->fetch_object($resql))
 			{
@@ -7764,7 +8705,9 @@ 
 		$out = '';
 
 		$hideunselectables = false;
-		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+			$hideunselectables = true;
+		}
 
 		if (empty($projectsListId))
 		{
@@ -7806,8 +8749,11 @@ 
 			}
 			if (!empty($show_empty)) {
 				$out .= '<option value="0" class="optiongrey">';
-				if (!is_numeric($show_empty)) $out .= $show_empty;
-				else $out .= '&nbsp;';
+				if (!is_numeric($show_empty)) {
+					$out .= $show_empty;
+				} else {
+					$out .= '&nbsp;';
+				}
 				$out .= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
@@ -7833,7 +8779,10 @@ 
 						if ($showproject == 'all')
 						{
 							$labeltoshow .= dol_trunc($obj->ref, 18); // Invoice ref
-							if ($obj->name) $labeltoshow .= ' - '.$obj->name; // Soc name
+							if ($obj->name) {
+								$labeltoshow .= ' - '.$obj->name;
+							}
+							// Soc name
 
 							$disabled = 0;
 							if ($obj->fk_statut == Project::STATUS_DRAFT)
@@ -7842,7 +8791,9 @@ 
 								$labeltoshow .= ' - '.$langs->trans("Draft");
 							} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
-								if ($discard_closed == 2) $disabled = 1;
+								if ($discard_closed == 2) {
+									$disabled = 1;
+								}
 								$labeltoshow .= ' - '.$langs->trans("Closed");
 							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
@@ -7862,7 +8813,9 @@ 
 								$resultat = '';
 							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat .= ' disabled';
+								if ($disabled) {
+									$resultat .= ' disabled';
+								}
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
 								$resultat .= '>';
@@ -7919,8 +8872,12 @@ 
 		// For compatibility with forms that show themself the search criteria in addition of this component, we output the fields
 		foreach ($arrayofcriterias as $criterias) {
 		    foreach ($criterias as $criteriafamilykey => $criteriafamilyval) {
-		    	if (in_array('search_'.$criteriafamilykey, $arrayofinputfieldsalreadyoutput)) continue;
-		        if (in_array($criteriafamilykey, array('rowid', 'ref_ext', 'entity', 'extraparams'))) continue;
+		    	if (in_array('search_'.$criteriafamilykey, $arrayofinputfieldsalreadyoutput)) {
+		    		continue;
+		    	}
+		        if (in_array($criteriafamilykey, array('rowid', 'ref_ext', 'entity', 'extraparams'))) {
+		        	continue;
+		        }
 		        if (in_array($criteriafamilyval['type'], array('date', 'datetime', 'timestamp'))) {
 		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_start">';
 		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startyear">';

htdocs/core/tpl/extrafields_view.tpl.php

Indentation +21 added lines, -21 removed lines

@@ -51,9 +51,9 @@ 
 if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label']))
 {
 	$lastseparatorkeyfound = '';
-    $extrafields_collapse_num = '';
-    $extrafields_collapse_num_old = '';
-    $i = 0;
+	$extrafields_collapse_num = '';
+	$extrafields_collapse_num_old = '';
+	$i = 0;
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $tmpkeyextra => $tmplabelextra)
 	{
 		$i++;
@@ -94,19 +94,19 @@ 
 		// Print line tr of extra field
 		if ($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra] == 'separate')
 		{
-            $extrafields_collapse_num = '';
-            $extrafield_param = $extrafields->attributes[$object->table_element]['param'][$tmpkeyextra];
-            if (!empty($extrafield_param) && is_array($extrafield_param)) {
-                $extrafield_param_list = array_keys($extrafield_param['options']);
+			$extrafields_collapse_num = '';
+			$extrafield_param = $extrafields->attributes[$object->table_element]['param'][$tmpkeyextra];
+			if (!empty($extrafield_param) && is_array($extrafield_param)) {
+				$extrafield_param_list = array_keys($extrafield_param['options']);
 
-                if (count($extrafield_param_list) > 0) {
-                    $extrafield_collapse_display_value = intval($extrafield_param_list[0]);
+				if (count($extrafield_param_list) > 0) {
+					$extrafield_collapse_display_value = intval($extrafield_param_list[0]);
 
-                    if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
-                        $extrafields_collapse_num = $extrafields->attributes[$object->table_element]['pos'][$tmpkeyextra];
-                    }
-                }
-            }
+					if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
+						$extrafields_collapse_num = $extrafields->attributes[$object->table_element]['pos'][$tmpkeyextra];
+					}
+				}
+			}
 
 			print $extrafields->showSeparator($tmpkeyextra, $object);
 
@@ -149,11 +149,11 @@ 
 			$isdraft = ((isset($object->statut) && $object->statut == 0) || (isset($object->status) && $object->status == 0));
 			if (($isdraft || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$tmpkeyextra]))
 				&& $permok && $enabled != 5 && ($action != 'edit_extras' || GETPOST('attribute') != $tmpkeyextra)
-			    && empty($extrafields->attributes[$object->table_element]['computed'][$tmpkeyextra]))
+				&& empty($extrafields->attributes[$object->table_element]['computed'][$tmpkeyextra]))
 			{
-			    $fieldid = 'id';
-			    if ($object->table_element == 'societe') $fieldid = 'socid';
-			    print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$tmpkeyextra.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';
+				$fieldid = 'id';
+				if ($object->table_element == 'societe') $fieldid = 'socid';
+				print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$tmpkeyextra.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td>';
@@ -178,9 +178,9 @@ 
 			//TODO Improve element and rights detection
 			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'none') == $tmpkeyextra)
 			{
-			    $fieldid = 'id';
-			    if ($object->table_element == 'societe') $fieldid = 'socid';
-			    print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';
+				$fieldid = 'id';
+				if ($object->table_element == 'societe') $fieldid = 'socid';
+				print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="'.$tmpkeyextra.'">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';

Braces +77 added lines, -25 removed lines

@@ -32,19 +32,31 @@ 
 	exit;
 }
 
-if (!is_object($form)) $form = new Form($db);
+if (!is_object($form)) {
+	$form = new Form($db);
+}
 
 
 ?>
 <!-- BEGIN PHP TEMPLATE extrafields_view.tpl.php -->
 <?php
-if (!is_array($parameters)) $parameters = array();
-if (!empty($cols)) $parameters['colspan'] = ' colspan="'.$cols.'"';
-if (!empty($cols)) $parameters['cols'] = $cols;
-if (!empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
+if (!is_array($parameters)) {
+	$parameters = array();
+}
+if (!empty($cols)) {
+	$parameters['colspan'] = ' colspan="'.$cols.'"';
+}
+if (!empty($cols)) {
+	$parameters['cols'] = $cols;
+}
+if (!empty($object->fk_soc)) {
+	$parameters['socid'] = $object->fk_soc;
+}
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
 print $hookmanager->resPrint;
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 
 //var_dump($extrafields->attributes[$object->table_element]);
@@ -77,12 +89,23 @@ 
 		}
 		//print $tmpkeyextra.'-'.$enabled.'-'.$perms.'-'.$tmplabelextra.$_POST["options_" . $tmpkeyextra].'<br>'."\n";
 
-		if (empty($enabled)) continue; // 0 = Never visible field
-		if (abs($enabled) != 1 && abs($enabled) != 3 && abs($enabled) != 5 && abs($enabled) != 4) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list <> 4 = not visible at the creation
-		if (empty($perms)) continue; // 0 = Not visible
+		if (empty($enabled)) {
+			continue;
+		}
+		// 0 = Never visible field
+		if (abs($enabled) != 1 && abs($enabled) != 3 && abs($enabled) != 5 && abs($enabled) != 4) {
+			continue;
+		}
+		// <> -1 and <> 1 and <> 3 = not visible on forms, only on list <> 4 = not visible at the creation
+		if (empty($perms)) {
+			continue;
+		}
+		// 0 = Not visible
 
 		// Load language if required
-		if (!empty($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra]);
+		if (!empty($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra])) {
+			$langs->load($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra]);
+		}
 		if ($action == 'edit_extras')
 		{
 			$value = (isset($_POST["options_".$tmpkeyextra]) ? $_POST["options_".$tmpkeyextra] : $object->array_options["options_".$tmpkeyextra]);
@@ -126,25 +149,48 @@ 
 			print '<tr>';
 
 			print '<td class="';
-			if ((!empty($action) && ($action == 'create' || $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$tmpkeyextra])) print ' fieldrequired';
+			if ((!empty($action) && ($action == 'create' || $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$tmpkeyextra])) {
+				print ' fieldrequired';
+			}
 			print '">';
-			if (!empty($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra])) print $form->textwithpicto($langs->trans($tmplabelextra), $langs->trans($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra]));
-			else print $langs->trans($tmplabelextra);
+			if (!empty($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra])) {
+				print $form->textwithpicto($langs->trans($tmplabelextra), $langs->trans($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra]));
+			} else {
+				print $langs->trans($tmplabelextra);
+			}
 			print '</td>';
 
 			//TODO Improve element and rights detection
 			//var_dump($user->rights);
 			$permok = false;
 			$keyforperm = $object->element;
-			if ($object->element == 'fichinter') $keyforperm = 'ficheinter';
-			if (isset($user->rights->$keyforperm)) $permok = $user->rights->$keyforperm->creer || $user->rights->$keyforperm->create || $user->rights->$keyforperm->write;
-			if ($object->element == 'order_supplier')   $permok = $user->rights->fournisseur->commande->creer;
-			if ($object->element == 'invoice_supplier') $permok = $user->rights->fournisseur->facture->creer;
-			if ($object->element == 'shipping')         $permok = $user->rights->expedition->creer;
-			if ($object->element == 'delivery')         $permok = $user->rights->expedition->livraison->creer;
-			if ($object->element == 'productlot')       $permok = $user->rights->stock->creer;
-			if ($object->element == 'facturerec') 	    $permok = $user->rights->facture->creer;
-			if ($object->element == 'mo') 	    		$permok = $user->rights->mrp->write;
+			if ($object->element == 'fichinter') {
+				$keyforperm = 'ficheinter';
+			}
+			if (isset($user->rights->$keyforperm)) {
+				$permok = $user->rights->$keyforperm->creer || $user->rights->$keyforperm->create || $user->rights->$keyforperm->write;
+			}
+			if ($object->element == 'order_supplier') {
+				$permok = $user->rights->fournisseur->commande->creer;
+			}
+			if ($object->element == 'invoice_supplier') {
+				$permok = $user->rights->fournisseur->facture->creer;
+			}
+			if ($object->element == 'shipping') {
+				$permok = $user->rights->expedition->creer;
+			}
+			if ($object->element == 'delivery') {
+				$permok = $user->rights->expedition->livraison->creer;
+			}
+			if ($object->element == 'productlot') {
+				$permok = $user->rights->stock->creer;
+			}
+			if ($object->element == 'facturerec') {
+				$permok = $user->rights->facture->creer;
+			}
+			if ($object->element == 'mo') {
+				$permok = $user->rights->mrp->write;
+			}
 
 			$isdraft = ((isset($object->statut) && $object->statut == 0) || (isset($object->status) && $object->status == 0));
 			if (($isdraft || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$tmpkeyextra]))
@@ -152,7 +198,9 @@ 
 			    && empty($extrafields->attributes[$object->table_element]['computed'][$tmpkeyextra]))
 			{
 			    $fieldid = 'id';
-			    if ($object->table_element == 'societe') $fieldid = 'socid';
+			    if ($object->table_element == 'societe') {
+			    	$fieldid = 'socid';
+			    }
 			    print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$tmpkeyextra.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';
 			}
 			print '</tr></table>';
@@ -167,10 +215,12 @@ 
 			{
 				$datenotinstring = $object->array_options['options_'.$tmpkeyextra];
 				// print 'X'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.'x';
-				if (!is_numeric($object->array_options['options_'.$tmpkeyextra]))	// For backward compatibility
+				if (!is_numeric($object->array_options['options_'.$tmpkeyextra])) {
+					// For backward compatibility
 				{
 					$datenotinstring = $db->jdate($datenotinstring);
 				}
+				}
 				//print 'x'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
 				$value = isset($_POST["options_".$tmpkeyextra]) ? dol_mktime($_POST["options_".$tmpkeyextra."hour"], $_POST["options_".$tmpkeyextra."min"], 0, $_POST["options_".$tmpkeyextra."month"], $_POST["options_".$tmpkeyextra."day"], $_POST["options_".$tmpkeyextra."year"]) : $datenotinstring;
 			}
@@ -179,7 +229,9 @@ 
 			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'none') == $tmpkeyextra)
 			{
 			    $fieldid = 'id';
-			    if ($object->table_element == 'societe') $fieldid = 'socid';
+			    if ($object->table_element == 'societe') {
+			    	$fieldid = 'socid';
+			    }
 			    print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="'.$tmpkeyextra.'">';

htdocs/core/menus/standard/eldy.lib.php

Indentation +361 added lines, -361 removed lines

@@ -56,19 +56,19 @@ 
 
 	if (empty($noout)) print_start_menu_array();
 
-    $usemenuhider = 1;
+	$usemenuhider = 1;
 
 	// Show/Hide vertical menu. The hamburger icon for .menuhider action.
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-    	$showmode = 1;
-    	$classname = 'class="tmenu menuhider"';
-    	$idsel = 'menu';
+		$showmode = 1;
+		$classname = 'class="tmenu menuhider"';
+		$idsel = 'menu';
 
-    	$menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
+		$menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 	}
 
-    $menu_arr = array();
+	$menu_arr = array();
 
 	// Home
 	$menu_arr[] = array(
@@ -92,9 +92,9 @@ 
 
 	// Members
 	$tmpentry = array(
-	    'enabled' => (!empty($conf->adherent->enabled)),
-	    'perms' => (!empty($user->rights->adherent->lire)),
-	    'module' => 'adherent'
+		'enabled' => (!empty($conf->adherent->enabled)),
+		'perms' => (!empty($user->rights->adherent->lire)),
+		'module' => 'adherent'
 	);
 	$menu_arr[] = array(
 		'name' => 'Members',
@@ -117,13 +117,13 @@ 
 
 	// Third parties
 	$tmpentry = array(
-	    'enabled'=> ((!empty($conf->societe->enabled) &&
-	        (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-	        )
-	        || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-	        ),
-	    'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire)),
-	    'module'=>'societe|fournisseur'
+		'enabled'=> ((!empty($conf->societe->enabled) &&
+			(empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+			)
+			|| (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
+			),
+		'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire)),
+		'module'=>'societe|fournisseur'
 	);
 	$menu_arr[] = array(
 		'name' => 'Companies',
@@ -148,7 +148,7 @@ 
 	$tmpentry = array(
 		'enabled'=> (!empty($conf->product->enabled) || !empty($conf->service->enabled) || !empty($conf->expedition->enabled)),
 		'perms'=> (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire) || !empty($user->rights->expedition->lire)),
-	    'module'=>'product|service'
+		'module'=>'product|service'
 	);
 	$menu_arr[] = array(
 		'name' => 'Products',
@@ -157,7 +157,7 @@ 
 					? (array("TMenuProducts", " | ", "TMenuServices"))
 					: (!empty($conf->product->enabled) ? "TMenuProducts" : "TMenuServices"),
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "products",
 		'leftmenu' => '',
@@ -173,34 +173,34 @@ 
 
 	// MRP
 	$tmpentry = array(
-	    'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)),
-	    'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)),
-	    'module'=>'bom|mrp'
+		'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)),
+		'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)),
+		'module'=>'bom|mrp'
 	);
 	$menu_arr[] = array(
-	    'name' => 'TMenuMRP',
-	    'link' => '/mrp/index.php?mainmenu=mrp&amp;leftmenu=',
-	    'title' => "TMenuMRP",
-	    'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
-	    'target' => $atarget,
-	    'mainmenu' => "mrp",
-	    'leftmenu' => '',
-	    'position' => 30,
-	    'id' => $id,
-	    'idsel' => 'mrp',
-	    'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',
-	    'prefix' => '',
-	    'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 0 : 1),
-	    'loadLangs' => array("mrp"),
-	    'submenus' => array(),
+		'name' => 'TMenuMRP',
+		'link' => '/mrp/index.php?mainmenu=mrp&amp;leftmenu=',
+		'title' => "TMenuMRP",
+		'level' => 0,
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'target' => $atarget,
+		'mainmenu' => "mrp",
+		'leftmenu' => '',
+		'position' => 30,
+		'id' => $id,
+		'idsel' => 'mrp',
+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',
+		'prefix' => '',
+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 0 : 1),
+		'loadLangs' => array("mrp"),
+		'submenus' => array(),
 	);
 
 	// Projects
 	$tmpentry = array(
-	    'enabled'=> (!empty($conf->projet->enabled) ? 1 : 0),
-	    'perms'=> (!empty($user->rights->projet->lire) ? 1 : 0),
-	    'module'=>'projet'
+		'enabled'=> (!empty($conf->projet->enabled) ? 1 : 0),
+		'perms'=> (!empty($user->rights->projet->lire) ? 1 : 0),
+		'module'=>'projet'
 	);
 	$menu_arr[] = array(
 		'name' => 'Projet',
@@ -209,7 +209,7 @@ 
 					? (($conf->global->PROJECT_USE_OPPORTUNITIES == 2) ? "Leads" : "Projects")
 					: "Projects",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "project",
 		'leftmenu' => '',
@@ -225,14 +225,14 @@ 
 
 	// Commercial
 	$tmpentry = array(
-	    'enabled'=>(!empty($conf->propal->enabled) ||
-	        !empty($conf->commande->enabled) ||
-	    	!empty($conf->fournisseur->enabled) ||
-	    	!empty($conf->supplier_proposal->enabled) ||
-	    	!empty($conf->supplier_order->enabled) ||
-	    	!empty($conf->contrat->enabled) ||
-	        !empty($conf->ficheinter->enabled)
-	        ) ? 1 : 0,
+		'enabled'=>(!empty($conf->propal->enabled) ||
+			!empty($conf->commande->enabled) ||
+			!empty($conf->fournisseur->enabled) ||
+			!empty($conf->supplier_proposal->enabled) ||
+			!empty($conf->supplier_order->enabled) ||
+			!empty($conf->contrat->enabled) ||
+			!empty($conf->ficheinter->enabled)
+			) ? 1 : 0,
 		'perms'=>(!empty($user->rights->propal->lire) ||
 				  !empty($user->rights->commande->lire) ||
 				  !empty($user->rights->fournisseur->lire) ||
@@ -241,7 +241,7 @@ 
 				  !empty($user->rights->contrat->lire) ||
 				  !empty($user->rights->ficheinter->lire)
 			),
-	    'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
+		'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
 	);
 
 	$onlysupplierorder = !empty($user->rights->fournisseur->commande->lire) &&
@@ -257,7 +257,7 @@ 
 		'link' => ($onlysupplierorder ? '/fourn/commande/index.php?mainmenu=commercial&amp;leftmenu=' : '/comm/index.php?mainmenu=commercial&amp;leftmenu='),
 		'title' => "Commercial",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "commercial",
 		'leftmenu' => '',
@@ -273,25 +273,25 @@ 
 
 	// Billing - Financial
 	$tmpentry = array(
-	    'enabled'=>(!empty($conf->facture->enabled) ||
-	        !empty($conf->don->enabled) ||
-	        !empty($conf->tax->enabled) ||
-	        !empty($conf->salaries->enabled) ||
-	        !empty($conf->supplier_invoice->enabled) ||
-	        !empty($conf->loan->enabled) ||
-            !empty($conf->margins->enabled)
-	        ) ? 1 : 0,
-	    'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire)
-	        || !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read)
-	        || !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),
-	    'module'=>'facture|supplier_invoice|don|tax|salaries|loan'
+		'enabled'=>(!empty($conf->facture->enabled) ||
+			!empty($conf->don->enabled) ||
+			!empty($conf->tax->enabled) ||
+			!empty($conf->salaries->enabled) ||
+			!empty($conf->supplier_invoice->enabled) ||
+			!empty($conf->loan->enabled) ||
+			!empty($conf->margins->enabled)
+			) ? 1 : 0,
+		'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire)
+			|| !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read)
+			|| !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),
+		'module'=>'facture|supplier_invoice|don|tax|salaries|loan'
 	);
 	$menu_arr[] = array(
 		'name' => 'Compta',
 		'link' => '/compta/index.php?mainmenu=billing&amp;leftmenu=',
 		'title' =>  "MenuFinancial",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "billing",
 		'leftmenu' => '',
@@ -307,16 +307,16 @@ 
 
 	// Bank
 	$tmpentry = array(
-	    'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)),
+		'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)),
 		'perms'=>(!empty($user->rights->banque->lire) || !empty($user->rights->prelevement->lire) || !empty($user->rights->paymentbybanktransfer->read)),
-	    'module'=>'banque|prelevement|paymentbybanktransfer'
+		'module'=>'banque|prelevement|paymentbybanktransfer'
 	);
 	$menu_arr[] = array(
 		'name' => 'Bank',
 		'link' => '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=',
 		'title' =>  "MenuBankCash",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "bank",
 		'leftmenu' => '',
@@ -334,16 +334,16 @@ 
 
 	// Accounting
 	$tmpentry = array(
-	    'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled)),
-	    'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)),
-        'module'=>'comptabilite|accounting|asset'
+		'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled)),
+		'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)),
+		'module'=>'comptabilite|accounting|asset'
 	);
 	$menu_arr[] = array(
 		'name' => 'Accounting',
 		'link' => '/accountancy/index.php?mainmenu=accountancy&amp;leftmenu=',
 		'title' =>  "MenuAccountancy",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "accountancy",
 		'leftmenu' => '',
@@ -363,14 +363,14 @@ 
 	$tmpentry = array(
 		'enabled'=>(!empty($conf->hrm->enabled) || !empty($conf->holiday->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled) || !empty($conf->recruitment->enabled)),
 		'perms'=>(!empty($user->rights->hrm->employee->read) || !empty($user->rights->holiday->write) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire) || !empty($user->rights->recruitment->recruitmentjobposition->read)),
-	    'module'=>'hrm|holiday|deplacement|expensereport|recruitment'
+		'module'=>'hrm|holiday|deplacement|expensereport|recruitment'
 	);
 	$menu_arr[] = array(
 		'name' => 'HRM',
 		'link' => '/hrm/index.php?mainmenu=hrm&amp;leftmenu=',
 		'title' =>  "HRM",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "hrm",
 		'leftmenu' => '',
@@ -388,16 +388,16 @@ 
 
 	// Tools
 	$tmpentry = array(
-	    'enabled'=>1,
-	    'perms'=>1,
-	    'module'=>''
+		'enabled'=>1,
+		'perms'=>1,
+		'module'=>''
 	);
 	$menu_arr[] = array(
 		'name' => 'Tools',
 		'link' => '/core/tools.php?mainmenu=tools&amp;leftmenu=',
 		'title' =>  "Tools",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "tools",
 		'leftmenu' => '',
@@ -462,7 +462,7 @@ 
 		{
 			$newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);
 
-		    // url = url from host, shorturl = relative path into dolibarr sources
+			// url = url from host, shorturl = relative path into dolibarr sources
 			$url = $shorturl = $newTabMenu[$i]['url'];
 			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url']))	// Do not change url content for external links
 			{
@@ -474,7 +474,7 @@ 
 				//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
 				$url = dol_buildpath($url, 1).($param ? '?'.$param : '');
 				//$shorturl = $shorturl.($param?'?'.$param:'');
-                $shorturl = $url;
+				$shorturl = $url;
 				if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
 			}
 
@@ -490,7 +490,7 @@ 
 	// Sort on position
 	$menu->liste = dol_sort_array($menu->liste, 'position');
 
-    // Output menu entries
+	// Output menu entries
 	// Show logo company
 	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
@@ -525,20 +525,20 @@ 
 		print_end_menu_entry(4);
 	}
 
-    if (empty($noout)) {
-        foreach ($menu->liste as $menuval) {
-            print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
-            print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
-            print_end_menu_entry($menuval['enabled']);
-        }
-    }
+	if (empty($noout)) {
+		foreach ($menu->liste as $menuval) {
+			print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
+			print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
+			print_end_menu_entry($menuval['enabled']);
+		}
+	}
 
 	$showmode = 1;
-    if (empty($noout)) {
-        print_start_menu_entry('', 'class="tmenuend"', $showmode);
-        print_end_menu_entry($showmode);
-        print_end_menu_array();
-    }
+	if (empty($noout)) {
+		print_start_menu_entry('', 'class="tmenuend"', $showmode);
+		print_end_menu_entry($showmode);
+		print_end_menu_array();
+	}
 
 	return 0;
 }
@@ -551,7 +551,7 @@ 
  */
 function print_start_menu_array()
 {
-    global $conf;
+	global $conf;
 
 	print '<div class="tmenudiv">';
 	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
@@ -665,26 +665,26 @@ 
 	$mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"]);
 	$leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"]));
 
-    $usemenuhider = 0;
+	$usemenuhider = 0;
 
 	if (is_array($moredata) && !empty($moredata['searchform']))	// searchform can contains select2 code or link to show old search form or link to switch on search page
 	{
-        print "\n";
-        print "<!-- Begin SearchForm -->\n";
-        print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
-        print $moredata['searchform'];
-        print '</div>'."\n";
-        print "<!-- End SearchForm -->\n";
+		print "\n";
+		print "<!-- Begin SearchForm -->\n";
+		print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
+		print $moredata['searchform'];
+		print '</div>'."\n";
+		print "<!-- End SearchForm -->\n";
 	}
 
 	if (is_array($moredata) && !empty($moredata['bookmarks']))
 	{
-	    print "\n";
-	    print "<!-- Begin Bookmarks -->\n";
-	    print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
-	    print $moredata['bookmarks'];
-	    print '</div>'."\n";
-	    print "<!-- End Bookmarks -->\n";
+		print "\n";
+		print "<!-- Begin Bookmarks -->\n";
+		print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
+		print $moredata['bookmarks'];
+		print '</div>'."\n";
+		print "<!-- End Bookmarks -->\n";
 	}
 
 	$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
@@ -710,8 +710,8 @@ 
 
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup")
 			{
-			    // Load translation files required by the page
-                $langs->loadLangs(array("admin", "help"));
+				// Load translation files required by the page
+				$langs->loadLangs(array("admin", "help"));
 
 				$warnpicto = '';
 				if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
@@ -747,15 +747,15 @@ 
 			$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');
 			if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu))
 			{
-			    // Load translation files required by the page
-                $langs->loadLangs(array('admin', 'help'));
+				// Load translation files required by the page
+				$langs->loadLangs(array('admin', 'help'));
 
 				$newmenu->add('/admin/system/dolibarr.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == 'admintools_info') {
-                    $newmenu->add('/admin/system/modules.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Modules'), 2);
-				    $newmenu->add('/admin/triggers.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Triggers'), 2);
-                    $newmenu->add('/admin/system/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);
-                }
+					$newmenu->add('/admin/system/modules.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Modules'), 2);
+					$newmenu->add('/admin/triggers.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Triggers'), 2);
+					$newmenu->add('/admin/system/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);
+				}
 				$newmenu->add('/admin/system/browser.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoBrowser'), 1);
 				$newmenu->add('/admin/system/os.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoOS'), 1);
 				$newmenu->add('/admin/system/web.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoWebServer'), 1);
@@ -774,7 +774,7 @@ 
 				if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
 				{
 					$langs->load("products");
-				    $newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
+					$newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
 				}
 			}
 
@@ -905,33 +905,33 @@ 
 				$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);
 				$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {
-                    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);
-				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->rights->propale->lire);
-				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->rights->propale->lire);
-				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->rights->propale->lire);
-				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->rights->propale->lire);
-                    //$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->rights->propale->lire);
-                }
+					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);
+					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->rights->propale->lire);
+					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->rights->propale->lire);
+					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->rights->propale->lire);
+					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->rights->propale->lire);
+					//$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->rights->propale->lire);
+				}
 				$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->rights->propale->lire);
 			}
 
-            // Customers orders
-            if (!empty($conf->commande->enabled))
-            {
-                $langs->load("orders");
-                $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);
-                $newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
-                $newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
-                if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
-                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
-                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
-                    if (!empty($conf->expedition->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
-                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);
-                    //$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
-                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
-                }
-                $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
-            }
+			// Customers orders
+			if (!empty($conf->commande->enabled))
+			{
+				$langs->load("orders");
+				$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);
+				$newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
+				$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
+					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
+					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
+					if (!empty($conf->expedition->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
+					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);
+					//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
+					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
+				}
+				$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
+			}
 
 			// Supplier proposal
 			if (!empty($conf->supplier_proposal->enabled))
@@ -944,7 +944,7 @@ 
 			}
 
 			// Suppliers orders
-            if (!empty($conf->supplier_order->enabled))
+			if (!empty($conf->supplier_order->enabled))
 			{
 				$langs->load("orders");
 				$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);
@@ -952,16 +952,16 @@ 
 				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
-                    if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
-                }
-                // Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
+					if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
+				}
+				// Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->rights->fournisseur->commande->lire);
 
 
 				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);
@@ -976,11 +976,11 @@ 
 				$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
 				$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {
-                    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
-				    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);
-				    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);
-                    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);
-                }
+					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
+					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);
+					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);
+					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);
+				}
 			}
 
 			// Interventions
@@ -1078,9 +1078,9 @@ 
 				$langs->load("donations");
 				$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations');
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {
-                    $newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->rights->don->creer);
-                    $newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);
-                }
+					$newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->rights->don->creer);
+					$newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);
+				}
 				// if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->rights->don->lire);
 			}
 
@@ -1097,21 +1097,21 @@ 
 				{
 					$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->rights->tax->charges->lire);
 					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {
-                        $newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
-					    $newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-                        $newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing&amp;mode=sconly", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
-                    }
+						$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
+						$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing&amp;mode=sconly", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
+					}
 					// VAT
 					if (empty($conf->global->TAX_DISABLE_VAT_MENUS))
 					{
 						$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');
 						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {
-                            $newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-						    $newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-						    $newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-						    $newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
-                            $newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
-                        }
+							$newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
+							$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+							$newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
+							$newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
+							$newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+						}
 						global $mysoc;
 
 						//Local Taxes 1
@@ -1119,24 +1119,24 @@ 
 						{
 							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
 							if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {
-                                $newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-							    $newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-							    $newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-							    $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
-                                $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
-                            }
+								$newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
+								$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+								$newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
+								$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
+								$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+							}
 						}
 						//Local Taxes 2
 						if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1"))
 						{
 							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
 							if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {
-                                $newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-							    $newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-							    $newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-							    $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
-                                $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
-                            }
+								$newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
+								$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+								$newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
+								$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
+								$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+							}
 						}
 					}
 				}
@@ -1147,10 +1147,10 @@ 
 					$langs->load("salaries");
 					$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');
 					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {
-                        $newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("NewPayment"), 1, $user->rights->salaries->write);
-					    $newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->rights->salaries->read);
-                        $newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->rights->salaries->read);
-                    }
+						$newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("NewPayment"), 1, $user->rights->salaries->write);
+						$newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->rights->salaries->read);
+						$newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->rights->salaries->read);
+					}
 				}
 
 				// Loan
@@ -1159,9 +1159,9 @@ 
 					$langs->load("loan");
 					$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->rights->loan->read, '', $mainmenu, 'tax_loan');
 					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i', $leftmenu)) {
-                        $newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 1, $user->rights->loan->write);
-                        //$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read);
-                    }
+						$newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 1, $user->rights->loan->write);
+						//$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read);
+					}
 				}
 
 				// Various payment
@@ -1170,9 +1170,9 @@ 
 					$langs->load("banks");
 					$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->rights->banque->lire, '', $mainmenu, 'tax_various');
 					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {
-                        $newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 1, $user->rights->banque->modifier);
-                        $newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->rights->banque->lire);
-                    }
+						$newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 1, $user->rights->banque->modifier);
+						$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->rights->banque->lire);
+					}
 				}
 			}
 		}
@@ -1224,35 +1224,35 @@ 
 					$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 130);
 				}
 
-                // Transfer in accounting
-                $newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'transfer', 1);
-
-                // Binding
-                // $newmenu->add("", $langs->trans("Binding"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch');
-                if (!empty($conf->facture->enabled))
-                {
-                	$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
-                	if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {
-                		$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
-                		$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
-                	}
-                }
-                if (!empty($conf->supplier_invoice->enabled))
-                {
-                	$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');
-                	if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {
-                		$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
-                		$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
-                	}
-                }
-                if (!empty($conf->expensereport->enabled))
-                {
-                	$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');
-                	if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {
-                		$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
-                		$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
-                	}
-                }
+				// Transfer in accounting
+				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'transfer', 1);
+
+				// Binding
+				// $newmenu->add("", $langs->trans("Binding"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch');
+				if (!empty($conf->facture->enabled))
+				{
+					$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {
+						$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
+						$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+					}
+				}
+				if (!empty($conf->supplier_invoice->enabled))
+				{
+					$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {
+						$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
+						$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+					}
+				}
+				if (!empty($conf->expensereport->enabled))
+				{
+					$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {
+						$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
+						$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+					}
+				}
 
 				// Journals
 				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')
@@ -1311,24 +1311,24 @@ 
 					$db->free($resql);
 				}
 
-                // Accounting
-                $newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire, '', $mainmenu, 'accountancy', 1);
+				// Accounting
+				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire, '', $mainmenu, 'accountancy', 1);
 
 
-                // General Ledger
+				// General Ledger
 				$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);
 
 				// Balance
 				$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);
 
-                // Closure
-                if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
-                    $newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
+				// Closure
+				if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
+					$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
 
-                    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_closure/', $leftmenu)) {
-                        $newmenu->add("/accountancy/closure/validate.php?leftmenu=accountancy_closure", $langs->trans("MenuAccountancyValidationMovements"), 2, $user->rights->accounting->fiscalyear->write);
-                    }
-                }
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_closure/', $leftmenu)) {
+						$newmenu->add("/accountancy/closure/validate.php?leftmenu=accountancy_closure", $langs->trans("MenuAccountancyValidationMovements"), 2, $user->rights->accounting->fiscalyear->write);
+					}
+				}
 
 				// Files
 				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
@@ -1339,23 +1339,23 @@ 
 				// Reports
 				$newmenu->add("/compta/resultat/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
 
-                if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-                    $newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->rights->accounting->comptarapport->lire);
-                    $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
-                    $newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
-                }
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
+					$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
+				}
 
 				$modecompta = 'CREANCES-DETTES';
 				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
 				if ($modecompta)
 				{
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-                        $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);
-					    $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
-					    $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
-					    $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);
-                        $newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->rights->accounting->comptarapport->lire);
-                    }
+						$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->rights->accounting->comptarapport->lire);
+					}
 				}
 
 				$modecompta = 'RECETTES-DEPENSES';
@@ -1363,12 +1363,12 @@ 
 				if ($modecompta)
 				{
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-					    $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
-					    $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
-					    $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
-					    //$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);
-                        //$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"),3,$user->rights->accounting->comptarapport->lire);
-                    }
+						$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
+						//$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);
+						//$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"),3,$user->rights->accounting->comptarapport->lire);
+					}
 				}
 
 				$modecompta = 'CREANCES-DETTES';
@@ -1391,50 +1391,50 @@ 
 						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
 					}
 				}
-            }
+			}
 
 			// Accountancy (simple)
-            if (!empty($conf->comptabilite->enabled))
-            {
-            	// Files
-            	if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
-            	{
-            		$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
-            	}
-
-                // Bilan, resultats
-                $newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');
-
-                if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
-                    $newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);
-                    $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-                    /* On verra ca avec module compabilite expert
+			if (!empty($conf->comptabilite->enabled))
+			{
+				// Files
+				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
+				{
+					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
+				}
+
+				// Bilan, resultats
+				$newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');
+
+				if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
+					$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+					/* On verra ca avec module compabilite expert
                     $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
                     $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
                     */
-                    $newmenu->add("/compta/stats/index.php?leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/index.php?leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
 
-                    /*
+					/*
                     $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
                     if (! empty($conf->propal->enabled)) {
                         $newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->rights->compta->resultat->lire);
                         $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
                     }
                     */
-                    $newmenu->add("/compta/stats/casoc.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-                    $newmenu->add("/compta/stats/cabyuser.php?leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
-                    $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
-                    $newmenu->add("/compta/stats/byratecountry.php?leftmenu=report", $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report", $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);
 					//Achats
 					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report", $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
-                    // Journaux
-                    $newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);
-                    $newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);
-                }
-                //if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
-            }
+					// Journaux
+					$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);
+					$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);
+				}
+				//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+			}
 
 			// Assets
 			if (!empty($conf->asset->enabled))
@@ -1445,8 +1445,8 @@ 
 				$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuTypeAssets"), 1, $user->rights->asset->read, '', $mainmenu, 'asset_type');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/asset_type/', $leftmenu)) {
 					$newmenu->add("/asset/type.php?leftmenu=asset_type&amp;action=create", $langs->trans("MenuNewTypeAssets"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->setup_advance));
-                    $newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->rights->asset->read);
-                }
+					$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->rights->asset->read);
+				}
 			}
 		}
 
@@ -1485,13 +1485,13 @@ 
 				$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("PaymentByDirectDebit"), 0, $user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {
-				    $newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->rights->prelevement->bons->creer);
+					$newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->rights->prelevement->bons->creer);
 
-				    $newmenu->add("/compta/prelevement/bons.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);
-				    $newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->rights->prelevement->bons->lire);
-				    $newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->prelevement->bons->lire);
-				    $newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->prelevement->bons->lire);
-                }
+					$newmenu->add("/compta/prelevement/bons.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);
+					$newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->rights->prelevement->bons->lire);
+					$newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->prelevement->bons->lire);
+					$newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->prelevement->bons->lire);
+				}
 			}
 
 			// Bank transfer order
@@ -1514,9 +1514,9 @@ 
 			{
 				$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->rights->banque->cheque, '', $mainmenu, 'checks');
 				if (preg_match('/checks/', $leftmenu)) {
-                    $newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->rights->banque->cheque);
-                    $newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->cheque);
-                }
+					$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->rights->banque->cheque);
+					$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->cheque);
+				}
 			}
 
 			// Cash Control
@@ -1596,23 +1596,23 @@ 
 				$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
 				$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);
 
-                $newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);
-                if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
-                $newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->rights->produit->lire && $user->rights->stock->lire && $conf->global->MAIN_FEATURES_LEVEL >= 2);
+				$newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);
+				if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
+				$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->rights->produit->lire && $user->rights->stock->lire && $conf->global->MAIN_FEATURES_LEVEL >= 2);
 
-                // Categories for warehouses
-                if (!empty($conf->categorie->enabled))
-                {
-                	$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-                }
+				// Categories for warehouses
+				if (!empty($conf->categorie->enabled))
+				{
+					$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+				}
 			}
 
 			// Inventory
 			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 			{
-    			if (!empty($conf->stock->enabled))
-    			{
-    				$langs->load("stocks");
+				if (!empty($conf->stock->enabled))
+				{
+					$langs->load("stocks");
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 					{
 						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
@@ -1623,7 +1623,7 @@ 
 						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
 						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
 					}
-    			}
+				}
 			}
 
 			// Shipments
@@ -1634,14 +1634,14 @@ 
 				$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
 				$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "sendings") {
-                    $newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);
-				    $newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);
-                    $newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);
-                }
+					$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);
+					$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);
+					$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);
+				}
 				$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);
 			}
 
-            // Receptions
+			// Receptions
 			if (!empty($conf->reception->enabled))
 			{
 				$langs->load("receptions");
@@ -1660,24 +1660,24 @@ 
 		 */
 		if ($mainmenu == 'mrp')
 		{
-		    // BOM
-		    if (!empty($conf->bom->enabled) || !empty($conf->mrp->enabled))
-		    {
-		        $langs->load("mrp");
-
-		        $newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom');
-		        $newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->rights->bom->write, '', $mainmenu, 'bom');
-		        $newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read, '', $mainmenu, 'bom');
-		    }
-
-		    if (!empty($conf->mrp->enabled))
-		    {
-		    	$langs->load("mrp");
-
-		    	$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo');
-		    	$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->rights->mrp->write, '', $mainmenu, 'mo');
-		    	$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->rights->mrp->read, '', $mainmenu, 'mo');
-		    }
+			// BOM
+			if (!empty($conf->bom->enabled) || !empty($conf->mrp->enabled))
+			{
+				$langs->load("mrp");
+
+				$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom');
+				$newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->rights->bom->write, '', $mainmenu, 'bom');
+				$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read, '', $mainmenu, 'bom');
+			}
+
+			if (!empty($conf->mrp->enabled))
+			{
+				$langs->load("mrp");
+
+				$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo');
+				$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->rights->mrp->write, '', $mainmenu, 'mo');
+				$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->rights->mrp->read, '', $mainmenu, 'mo');
+			}
 		}
 
 		/*
@@ -1692,10 +1692,10 @@ 
 				$search_project_user = GETPOST('search_project_user', 'int');
 
 				$tmpentry = array(
-                    'enabled'=>(!empty($conf->projet->enabled)),
-				    'perms'=>(!empty($user->rights->projet->lire)),
-                    'module'=>'projet'
-                );
+					'enabled'=>(!empty($conf->projet->enabled)),
+					'perms'=>(!empty($user->rights->projet->lire)),
+					'module'=>'projet'
+				);
 				$showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);
 
 				$titleboth = $langs->trans("LeadsOrProjects");
@@ -1741,9 +1741,9 @@ 
 					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire);
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
 					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->rights->projet->lire);
-				    $newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
+					$newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
 
-				    $newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);
+					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);
 				}
 			}
 		}
@@ -1766,19 +1766,19 @@ 
 			// Leave/Holiday/Vacation module
 			if (!empty($conf->holiday->enabled))
 			{
-			    // Load translation files required by the page
-                $langs->loadLangs(array("holiday", "trips"));
+				// Load translation files required by the page
+				$langs->loadLangs(array("holiday", "trips"));
 
 				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm');
 				$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("New"), 1, $user->rights->holiday->write);
 				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("List"), 1, $user->rights->holiday->read);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "hrm") {
-                    $newmenu->add("/holiday/list.php?search_statut=1&mainmenu=hrm&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);
-				    $newmenu->add("/holiday/list.php?search_statut=2&mainmenu=hrm&leftmenu=hrm", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read);
-				    $newmenu->add("/holiday/list.php?search_statut=3&mainmenu=hrm&leftmenu=hrm", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read);
-				    $newmenu->add("/holiday/list.php?search_statut=4&mainmenu=hrm&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);
-                    $newmenu->add("/holiday/list.php?search_statut=5&mainmenu=hrm&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);
-                }
+					$newmenu->add("/holiday/list.php?search_statut=1&mainmenu=hrm&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_statut=2&mainmenu=hrm&leftmenu=hrm", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_statut=3&mainmenu=hrm&leftmenu=hrm", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_statut=4&mainmenu=hrm&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_statut=5&mainmenu=hrm&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);
+				}
 				$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read);
 				$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->read_all);
 				$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday);
@@ -1802,13 +1802,13 @@ 
 				$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->expensereport->creer);
 				$newmenu->add("/expensereport/list.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->rights->expensereport->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "expensereport") {
-                    $newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->rights->expensereport->lire);
-				    $newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->rights->expensereport->lire);
-				    $newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->rights->expensereport->lire);
-				    $newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->rights->expensereport->lire);
-				    $newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->rights->expensereport->lire);
-                    $newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->rights->expensereport->lire);
-                }
+					$newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->rights->expensereport->lire);
+					$newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->rights->expensereport->lire);
+					$newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->rights->expensereport->lire);
+					$newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->rights->expensereport->lire);
+					$newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->rights->expensereport->lire);
+					$newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->rights->expensereport->lire);
+				}
 				$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->expensereport->lire);
 			}
 
@@ -1868,7 +1868,7 @@ 
 			if (!empty($conf->adherent->enabled))
 			{
 				// Load translation files required by the page
-                $langs->loadLangs(array("members", "compta"));
+				$langs->loadLangs(array("members", "compta"));
 
 				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Members"), 0, $user->rights->adherent->lire, '', $mainmenu, 'members');
 				$newmenu->add("/adherents/card.php?leftmenu=members&amp;action=create", $langs->trans("NewMember"), 1, $user->rights->adherent->creer);
@@ -1971,7 +1971,7 @@ 
 				$lastopened = true;
 				for ($j = ($i + 1); $j < $num; $j++)
 				{
-				    if (empty($menu_array[$j]['level'])) $lastopened = false;
+					if (empty($menu_array[$j]['level'])) $lastopened = false;
 				}
 				if ($altok % 2 == 0)
 				{
@@ -1999,23 +1999,23 @@ 
 			$url = $shorturl = $shorturlwithoutparam = $menu_array[$i]['url'];
 			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url']))
 			{
-			    $tmp = explode('?', $menu_array[$i]['url'], 2);
-			    $url = $shorturl = $tmp[0];
-			    $param = (isset($tmp[1]) ? $tmp[1] : ''); // params in url of the menu link
-
-			    // Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
-			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu']))
-			    {
-			        $param .= ($param ? '&' : '').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';
-			    }
-			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu']))
-			    {
-			        $param .= ($param ? '&' : '').'leftmenu=';
-			    }
-			    //$url.="idmenu=".$menu_array[$i]['rowid'];    // Already done by menuLoad
-			    $url = dol_buildpath($url, 1).($param ? '?'.$param : '');
-			    $shorturlwithoutparam = $shorturl;
-			    $shorturl = $shorturl.($param ? '?'.$param : '');
+				$tmp = explode('?', $menu_array[$i]['url'], 2);
+				$url = $shorturl = $tmp[0];
+				$param = (isset($tmp[1]) ? $tmp[1] : ''); // params in url of the menu link
+
+				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu']))
+				{
+					$param .= ($param ? '&' : '').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';
+				}
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu']))
+				{
+					$param .= ($param ? '&' : '').'leftmenu=';
+				}
+				//$url.="idmenu=".$menu_array[$i]['rowid'];    // Already done by menuLoad
+				$url = dol_buildpath($url, 1).($param ? '?'.$param : '');
+				$shorturlwithoutparam = $shorturl;
+				$shorturl = $shorturl.($param ? '?'.$param : '');
 			}
 
 
@@ -2039,7 +2039,7 @@ 
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
 				} else {
-				    $lastlevel0 = 'hidden';
+					$lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
 				{