Dolibarr / dolibarr

htdocs/core/tpl/massactions_pre.tpl.php

Spacing +8 added lines, -8 removed lines

@@ -41,14 +41,14 @@ 
 {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$categ = new Categorie($db);
-	$categ_types=array();
-	$categ_type_array=$categ->getMapList();
+	$categ_types = array();
+	$categ_type_array = $categ->getMapList();
 	foreach ($categ_type_array as $categdef) {
-		if (isset($object) && $categdef['obj_table']==$object->table_element) {
-			if (!array_key_exists($categdef['code'], $categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+		if (isset($object) && $categdef['obj_table'] == $object->table_element) {
+			if (!array_key_exists($categdef['code'], $categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'], 'label'=>$langs->trans($categdef['obj_class']));
 		}
-		if (isset($objecttmp) && $categdef['obj_table']==$objecttmp->table_element) {
-			if (!array_key_exists($categdef['code'], $categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+		if (isset($objecttmp) && $categdef['obj_table'] == $objecttmp->table_element) {
+			if (!array_key_exists($categdef['code'], $categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'], 'label'=>$langs->trans($categdef['obj_class']));
 		}
 	}
 
@@ -56,12 +56,12 @@ 
 	if (!empty($categ_types)) {
 		foreach ($categ_types as $categ_type) {
 			$cate_arbo = $form->select_all_categories($categ_type['code'], null, 'parent', null, null, 1);
-			$formquestion[]=array('type' => 'other',
+			$formquestion[] = array('type' => 'other',
 					'name' => 'affecttag_'.$categ_type['code'],
 					'label' => $langs->trans("Tag").' '.$categ_type['label'],
 					'value' => $form->multiselectarray('contcats_'.$categ_type['code'], $cate_arbo, GETPOST('contcats_'.$categ_type['code'], 'array'), null, null, null, null, '60%'));
 		}
-		$formquestion[]=array('type' => 'other',
+		$formquestion[] = array('type' => 'other',
 				'name' => 'affecttag_type',
 				'label' => '',
 				'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",", array_keys($categ_types)).'"/>');

Braces +18 added lines, -8 removed lines

@@ -45,10 +45,14 @@ 
 	$categ_type_array=$categ->getMapList();
 	foreach ($categ_type_array as $categdef) {
 		if (isset($object) && $categdef['obj_table']==$object->table_element) {
-			if (!array_key_exists($categdef['code'], $categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+			if (!array_key_exists($categdef['code'], $categ_types)) {
+				$categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+			}
 		}
 		if (isset($objecttmp) && $categdef['obj_table']==$objecttmp->table_element) {
-			if (!array_key_exists($categdef['code'], $categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+			if (!array_key_exists($categdef['code'], $categ_types)) {
+				$categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+			}
 		}
 	}
 
@@ -87,10 +91,12 @@ 
 			{
 				$listofselectedid[$toselectid] = $toselectid;
 				$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
-				if ($objecttmp->element == 'societe')
-					$thirdpartyid = $objecttmp->id;
-				if ($objecttmp->element == 'expensereport')
-					$thirdpartyid = $objecttmp->fk_user_author;
+				if ($objecttmp->element == 'societe') {
+									$thirdpartyid = $objecttmp->id;
+				}
+				if ($objecttmp->element == 'expensereport') {
+									$thirdpartyid = $objecttmp->fk_user_author;
+				}
 				$listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
 				$listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
 			}
@@ -115,16 +121,20 @@ 
 		$formmail->fromid = $user->id;
 	}
 	$formmail->trackid = $trackid;
-	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
+	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) {
+		// If bit 2 is set
 	{
 		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	}
 		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
 	}
 	$formmail->withfrom = 1;
 	$liste = $langs->trans("AllRecipientSelected", count($arrayofselected));
-	if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selected, we can suggest contacts
+	if (count($listofselectedthirdparties) == 1) {
+		// Only 1 different recipient selected, we can suggest contacts
 	{
 		$liste = array();
+	}
 		$thirdpartyid = array_shift($listofselectedthirdparties);
 		if ($objecttmp->element == 'expensereport')
 		{

htdocs/core/actions_massactions.inc.php

Spacing +7 added lines, -7 removed lines

@@ -1294,9 +1294,9 @@ 
 if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd) {
 	$db->begin();
 
-	$affecttag_type=GETPOST('affecttag_type', 'alpha');
+	$affecttag_type = GETPOST('affecttag_type', 'alpha');
 	if (!empty($affecttag_type)) {
-		$affecttag_type_array=explode(',', $affecttag_type);
+		$affecttag_type_array = explode(',', $affecttag_type);
 	} else {
 		setEventMessage('CategTypeNotFound', 'errors');
 	}
@@ -1304,10 +1304,10 @@ 
 		//check if tag type submited exists into Tag Map categorie class
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categ = new Categorie($db);
-		$to_affecttag_type_array=array();
-		$categ_type_array=$categ->getMapList();
+		$to_affecttag_type_array = array();
+		$categ_type_array = $categ->getMapList();
 		foreach ($categ_type_array as $categdef) {
-			if (in_array($categdef['code'],  $affecttag_type_array)) {
+			if (in_array($categdef['code'], $affecttag_type_array)) {
 				$to_affecttag_type_array[] = $categdef['code'];
 			}
 		}
@@ -1316,7 +1316,7 @@ 
 		$nbok = 0;
 		if (!empty($to_affecttag_type_array)) {
 			foreach ($to_affecttag_type_array as $categ_type) {
-				$contcats = GETPOST('contcats_' . $categ_type, 'array');
+				$contcats = GETPOST('contcats_'.$categ_type, 'array');
 				//var_dump($toselect);exit;
 				foreach ($toselect as $toselectid) {
 					$result = $object->fetch($toselectid);
@@ -1343,7 +1343,7 @@ 
 		if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null);
 		else setEventMessages($langs->trans("RecordsModified", $nbok), null);
 		$db->commit();
-		$toselect=array();
+		$toselect = array();
 	} else {
 		$db->rollback();
 	}

Braces +380 added lines, -133 removed lines

@@ -44,9 +44,15 @@ 
 }
 
 // For backward compatibility
-if (!empty($permtoread) && empty($permissiontoread)) $permissiontoread = $permtoread;
-if (!empty($permtocreate) && empty($permissiontoadd)) $permissiontoadd = $permtocreate;
-if (!empty($permtodelete) && empty($permissiontodelete)) $permissiontodelete = $permtodelete;
+if (!empty($permtoread) && empty($permissiontoread)) {
+	$permissiontoread = $permtoread;
+}
+if (!empty($permtocreate) && empty($permissiontoadd)) {
+	$permissiontoadd = $permtocreate;
+}
+if (!empty($permtodelete) && empty($permissiontodelete)) {
+	$permissiontodelete = $permtodelete;
+}
 
 
 // Mass actions. Controls on number of lines checked.
@@ -62,10 +68,12 @@ 
 	$error++;
 }
 
-if (!$error && $massaction == 'confirm_presend' && !GETPOST('sendmail'))  // If we do not choose button send (for example when we change template or limit), we must not send email, but keep on send email form
+if (!$error && $massaction == 'confirm_presend' && !GETPOST('sendmail')) {
+	// If we do not choose button send (for example when we change template or limit), we must not send email, but keep on send email form
 {
 	$massaction = 'presend';
 }
+}
 if (!$error && $massaction == 'confirm_presend')
 {
 	$resaction = '';
@@ -87,8 +95,12 @@ 
 		$thirdparty = new Societe($db);
 
 		$objecttmp = new $objectclass($db);
-		if ($objecttmp->element == 'expensereport') $thirdparty = new User($db);
-		if ($objecttmp->element == 'holiday')       $thirdparty = new User($db);
+		if ($objecttmp->element == 'expensereport') {
+			$thirdparty = new User($db);
+		}
+		if ($objecttmp->element == 'holiday') {
+			$thirdparty = new User($db);
+		}
 
 		foreach ($toselect as $toselectid)
 		{
@@ -99,10 +111,18 @@ 
 				$listofobjectid[$toselectid] = $toselectid;
 
 				$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
-				if ($objecttmp->element == 'societe') $thirdpartyid = $objecttmp->id;
-				if ($objecttmp->element == 'expensereport') $thirdpartyid = $objecttmp->fk_user_author;
-				if ($objecttmp->element == 'holiday')       $thirdpartyid = $objecttmp->fk_user;
-				if (empty($thirdpartyid)) $thirdpartyid = 0;
+				if ($objecttmp->element == 'societe') {
+					$thirdpartyid = $objecttmp->id;
+				}
+				if ($objecttmp->element == 'expensereport') {
+					$thirdpartyid = $objecttmp->fk_user_author;
+				}
+				if ($objecttmp->element == 'holiday') {
+					$thirdpartyid = $objecttmp->fk_user;
+				}
+				if (empty($thirdpartyid)) {
+					$thirdpartyid = 0;
+				}
 
 				if ($objectclass == 'Facture') {
 					$tmparraycontact = array();
@@ -131,12 +151,17 @@ 
 	$receiver = $_POST['receiver'];
 	if (!is_array($receiver))
 	{
-		if (empty($receiver) || $receiver == '-1') $receiver = array();
-		else $receiver = array($receiver);
+		if (empty($receiver) || $receiver == '-1') {
+			$receiver = array();
+		} else {
+			$receiver = array($receiver);
+		}
 	}
-	if (!trim($_POST['sendto']) && count($receiver) == 0 && count($listofobjectthirdparties) == 1)	// if only one recipient, receiver is mandatory
+	if (!trim($_POST['sendto']) && count($receiver) == 0 && count($listofobjectthirdparties) == 1) {
+		// if only one recipient, receiver is mandatory
 	{
 	 	$error++;
+	}
 	   	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Recipient")), null, 'warnings');
 	   	$massaction = 'presend';
 	}
@@ -177,12 +202,16 @@ 
 				foreach ($receiver as $key=>$val)
 				{
 					// Recipient was provided from combo list
-					if ($val == 'thirdparty') // Id of third party or user
+					if ($val == 'thirdparty') {
+						// Id of third party or user
 					{
 						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
-					} elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
+					}
+					} elseif ($val && method_exists($thirdparty, 'contact_get_property')) {
+						// Id of contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
+					}
 						$sendtoid[] = $val;
 					}
 				}
@@ -193,8 +222,11 @@ 
 			$receivercc = $_POST['receivercc'];
 			if (!is_array($receivercc))
 			{
-				if ($receivercc == '-1') $receivercc = array();
-				else $receivercc = array($receivercc);
+				if ($receivercc == '-1') {
+					$receivercc = array();
+				} else {
+					$receivercc = array($receivercc);
+				}
 			}
 			$tmparray = array();
 			if (trim($_POST['sendtocc']))
@@ -206,12 +238,16 @@ 
 				foreach ($receivercc as $key=>$val)
 				{
 					// Recipient was provided from combo list
-					if ($val == 'thirdparty') // Id of third party
+					if ($val == 'thirdparty') {
+						// Id of third party
 					{
 						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
-					} elseif ($val)	// Id du contact
+					}
+					} elseif ($val) {
+						// Id du contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
+					}
 						//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
 					}
 				}
@@ -249,11 +285,13 @@ 
 				}
 
 				// Test recipient
-				if (empty($sendto)) 	// For the case, no recipient were set (multi thirdparties send)
+				if (empty($sendto)) {
+					// For the case, no recipient were set (multi thirdparties send)
 				{
 					if ($objectobj->element == 'societe')
 					{
 						$sendto = $objectobj->email;
+				}
 					} elseif ($objectobj->element == 'expensereport')
 					{
 						$fuser = new User($db);
@@ -380,13 +418,27 @@ 
 				$message = GETPOST('message', 'restricthtml');
 
 				$sendtobcc = GETPOST('sendtoccc');
-				if ($objectclass == 'Propal') 				$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
-				if ($objectclass == 'Commande') 			$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
-				if ($objectclass == 'Facture') 				$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
-				if ($objectclass == 'Supplier_Proposal') 	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO));
-				if ($objectclass == 'CommandeFournisseur')	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO));
-				if ($objectclass == 'FactureFournisseur')	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO));
-				if ($objectclass == 'Project') 			    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO));
+				if ($objectclass == 'Propal') {
+					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
+				}
+				if ($objectclass == 'Commande') {
+					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
+				}
+				if ($objectclass == 'Facture') {
+					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
+				}
+				if ($objectclass == 'Supplier_Proposal') {
+					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO));
+				}
+				if ($objectclass == 'CommandeFournisseur') {
+					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO));
+				}
+				if ($objectclass == 'FactureFournisseur') {
+					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO));
+				}
+				if ($objectclass == 'Project') {
+					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO));
+				}
 
 				// $listofqualifiedobj is array with key = object id and value is instance of qualified objects, for the current thirdparty (but thirdparty property is not loaded yet)
 				// $looparray will be an array with number of email to send for the current thirdparty (so 1 or n if n object for same thirdparty)
@@ -406,12 +458,14 @@ 
 				//var_dump($looparray);exit;
 				dol_syslog("We have set an array of ".count($looparray)." emails to send. oneemailperrecipient=".$oneemailperrecipient);
 				//var_dump($oneemailperrecipient); var_dump($listofqualifiedobj); var_dump($listofqualifiedref);
-				foreach ($looparray as $objectid => $objecttmp)		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object
+				foreach ($looparray as $objectid => $objecttmp) {
+					// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object
 				{
 					// Make substitution in email content
 					if (!empty($conf->projet->enabled) && method_exists($objecttmp, 'fetch_projet') && is_null($objecttmp->project))
 					{
 						$objecttmp->fetch_projet();
+				}
 					}
 					$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $objecttmp);
 					$substitutionarray['__ID__']    = ($oneemailperrecipient ? join(', ', array_keys($listofqualifiedobj)) : $objecttmp->id);
@@ -462,17 +516,35 @@ 
 					if ($oneemailperrecipient)
 					{
 						$trackid = 'thi'.$thirdparty->id;
-						if ($objecttmp->element == 'expensereport') $trackid = 'use'.$thirdparty->id;
-						if ($objecttmp->element == 'holiday') $trackid = 'use'.$thirdparty->id;
+						if ($objecttmp->element == 'expensereport') {
+							$trackid = 'use'.$thirdparty->id;
+						}
+						if ($objecttmp->element == 'holiday') {
+							$trackid = 'use'.$thirdparty->id;
+						}
 					} else {
 						$trackid = strtolower(get_class($objecttmp));
-						if (get_class($objecttmp) == 'Contrat')  $trackid = 'con';
-						if (get_class($objecttmp) == 'Propal')   $trackid = 'pro';
-						if (get_class($objecttmp) == 'Commande') $trackid = 'ord';
-						if (get_class($objecttmp) == 'Facture')  $trackid = 'inv';
-						if (get_class($objecttmp) == 'Supplier_Proposal')   $trackid = 'spr';
-						if (get_class($objecttmp) == 'CommandeFournisseur') $trackid = 'sor';
-						if (get_class($objecttmp) == 'FactureFournisseur')  $trackid = 'sin';
+						if (get_class($objecttmp) == 'Contrat') {
+							$trackid = 'con';
+						}
+						if (get_class($objecttmp) == 'Propal') {
+							$trackid = 'pro';
+						}
+						if (get_class($objecttmp) == 'Commande') {
+							$trackid = 'ord';
+						}
+						if (get_class($objecttmp) == 'Facture') {
+							$trackid = 'inv';
+						}
+						if (get_class($objecttmp) == 'Supplier_Proposal') {
+							$trackid = 'spr';
+						}
+						if (get_class($objecttmp) == 'CommandeFournisseur') {
+							$trackid = 'sor';
+						}
+						if (get_class($objecttmp) == 'FactureFournisseur') {
+							$trackid = 'sin';
+						}
 
 						$trackid .= $objecttmp->id;
 					}
@@ -480,7 +552,9 @@ 
 					//var_dump($trackid);exit;
 					//var_dump($subjectreplaced);
 
-					if (empty($sendcontext)) $sendcontext = 'standard';
+					if (empty($sendcontext)) {
+						$sendcontext = 'standard';
+					}
 
 					// Send mail (substitutionarray must be done just before this)
 					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -499,7 +573,10 @@ 
 							// Insert logs into agenda
 							foreach ($listofqualifiedobj as $objid2 => $objectobj2)
 							{
-								if ((!$oneemailperrecipient) && $objid2 != $objectid) continue; // We discard this pass to avoid duplicate with other pass in looparray at higher level
+								if ((!$oneemailperrecipient) && $objid2 != $objectid) {
+									continue;
+								}
+								// We discard this pass to avoid duplicate with other pass in looparray at higher level
 
 								dol_syslog("Try to insert email event into agenda for objid=".$objid2." => objectobj=".get_class($objectobj2));
 
@@ -513,7 +590,9 @@ 
 								$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 								if ($message)
 								{
-									if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+									if ($sendtocc) {
+										$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+									}
 									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subjectreplaced);
 									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
 									$actionmsg = dol_concatdesc($actionmsg, $messagereplaced);
@@ -528,20 +607,38 @@ 
 								$objectobj2->elementtype	= $objectobj2->element;
 
 								$triggername = strtoupper(get_class($objectobj2)).'_SENTBYMAIL';
-								if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYMAIL';
-								if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYMAIL';
-								if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYMAIL';
-								if ($triggername == 'FACTURE_SENTBYMAIL')    $triggername = 'BILL_SENTBYMAIL';
-								if ($triggername == 'EXPEDITION_SENTBYMAIL') $triggername = 'SHIPPING_SENTBYMAIL';
-								if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
-								if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYMAIL';
-								if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYMAIL';
+								if ($triggername == 'SOCIETE_SENTBYMAIL') {
+									$triggername = 'COMPANY_SENTBYMAIL';
+								}
+								if ($triggername == 'CONTRAT_SENTBYMAIL') {
+									$triggername = 'CONTRACT_SENTBYMAIL';
+								}
+								if ($triggername == 'COMMANDE_SENTBYMAIL') {
+									$triggername = 'ORDER_SENTBYMAIL';
+								}
+								if ($triggername == 'FACTURE_SENTBYMAIL') {
+									$triggername = 'BILL_SENTBYMAIL';
+								}
+								if ($triggername == 'EXPEDITION_SENTBYMAIL') {
+									$triggername = 'SHIPPING_SENTBYMAIL';
+								}
+								if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') {
+									$triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
+								}
+								if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') {
+									$triggername = 'BILL_SUPPLIER_SENTBYMAIL';
+								}
+								if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') {
+									$triggername = 'PROPOSAL_SUPPLIER_SENTBYMAIL';
+								}
 
 								if (!empty($triggername))
 								{
 									// Call trigger
 									$result = $objectobj2->call_trigger($triggername, $user);
-									if ($result < 0) $error++;
+									if ($result < 0) {
+										$error++;
+									}
 									// End call triggers
 
 									if ($error)
@@ -590,9 +687,11 @@ 
 	}
 }
 
-if ($massaction == 'confirm_createbills')   // Create bills from orders
+if ($massaction == 'confirm_createbills') {
+	// Create bills from orders
 {
 	$orders = GETPOST('toselect', 'array');
+}
 	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
 	$validate_invoices = GETPOST('validate_invoices', 'int');
 
@@ -606,10 +705,15 @@ 
 	foreach ($orders as $id_order)
 	{
 		$cmd = new Commande($db);
-		if ($cmd->fetch($id_order) <= 0) continue;
+		if ($cmd->fetch($id_order) <= 0) {
+			continue;
+		}
 
 		$objecttmp = new Facture($db);
-		if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $objecttmp = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
+		if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) {
+			$objecttmp = $TFactThird[$cmd->socid];
+		}
+		// If option "one bill per third" is set, we use already created order.
 		else {
 			// Load extrafields of order
 			$cmd->fetch_optionals();
@@ -620,7 +724,9 @@ 
 			$objecttmp->mode_reglement_id	= $cmd->mode_reglement_id;
 			$objecttmp->fk_project = $cmd->fk_project;
 			$objecttmp->multicurrency_code = $cmd->multicurrency_code;
-			if (empty($createbills_onebythird)) $objecttmp->ref_client = $cmd->ref_client;
+			if (empty($createbills_onebythird)) {
+				$objecttmp->ref_client = $cmd->ref_client;
+			}
 
 			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($datefacture))
@@ -636,7 +742,9 @@ 
 
 			$res = $objecttmp->create($user);
 
-			if ($res > 0) $nb_bills_created++;
+			if ($res > 0) {
+				$nb_bills_created++;
+			}
 		}
 
 		if ($objecttmp->id > 0)
@@ -705,14 +813,26 @@ 
 						$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 						// Date start
 						$date_start = false;
-						if ($lines[$i]->date_debut_prevue) $date_start = $lines[$i]->date_debut_prevue;
-						if ($lines[$i]->date_debut_reel) $date_start = $lines[$i]->date_debut_reel;
-						if ($lines[$i]->date_start) $date_start = $lines[$i]->date_start;
+						if ($lines[$i]->date_debut_prevue) {
+							$date_start = $lines[$i]->date_debut_prevue;
+						}
+						if ($lines[$i]->date_debut_reel) {
+							$date_start = $lines[$i]->date_debut_reel;
+						}
+						if ($lines[$i]->date_start) {
+							$date_start = $lines[$i]->date_start;
+						}
 						//Date end
 						$date_end = false;
-						if ($lines[$i]->date_fin_prevue) $date_end = $lines[$i]->date_fin_prevue;
-						if ($lines[$i]->date_fin_reel) $date_end = $lines[$i]->date_fin_reel;
-						if ($lines[$i]->date_end) $date_end = $lines[$i]->date_end;
+						if ($lines[$i]->date_fin_prevue) {
+							$date_end = $lines[$i]->date_fin_prevue;
+						}
+						if ($lines[$i]->date_fin_reel) {
+							$date_end = $lines[$i]->date_fin_reel;
+						}
+						if ($lines[$i]->date_end) {
+							$date_end = $lines[$i]->date_end;
+						}
 						// Reset fk_parent_line for no child products and special product
 						if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
 						{
@@ -775,8 +895,11 @@ 
 
 		//$cmd->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
 
-		if (!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $objecttmp;
-		else $TFact[$objecttmp->id] = $objecttmp;
+		if (!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) {
+			$TFactThird[$cmd->socid] = $objecttmp;
+		} else {
+			$TFact[$objecttmp->id] = $objecttmp;
+		}
 	}
 
 	// Build doc with all invoices
@@ -822,29 +945,75 @@ 
 
 		// Make a redirect to avoid to bill twice if we make a refresh or back
 		$param = '';
-		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-		if ($sall)					$param .= '&sall='.urlencode($sall);
-		if ($socid > 0)             $param .= '&socid='.urlencode($socid);
-		if ($search_status != '')      $param .= '&search_status='.urlencode($search_status);
-		if ($search_orderday)      		$param .= '&search_orderday='.urlencode($search_orderday);
-		if ($search_ordermonth)      		$param .= '&search_ordermonth='.urlencode($search_ordermonth);
-		if ($search_orderyear)       		$param .= '&search_orderyear='.urlencode($search_orderyear);
-		if ($search_deliveryday)   		$param .= '&search_deliveryday='.urlencode($search_deliveryday);
-		if ($search_deliverymonth)   		$param .= '&search_deliverymonth='.urlencode($search_deliverymonth);
-		if ($search_deliveryyear)    		$param .= '&search_deliveryyear='.urlencode($search_deliveryyear);
-		if ($search_ref)      		$param .= '&search_ref='.urlencode($search_ref);
-		if ($search_company)  		$param .= '&search_company='.urlencode($search_company);
-		if ($search_ref_customer)	$param .= '&search_ref_customer='.urlencode($search_ref_customer);
-		if ($search_user > 0) 		$param .= '&search_user='.urlencode($search_user);
-		if ($search_sale > 0) 		$param .= '&search_sale='.urlencode($search_sale);
-		if ($search_total_ht != '') $param .= '&search_total_ht='.urlencode($search_total_ht);
-		if ($search_total_vat != '') $param .= '&search_total_vat='.urlencode($search_total_vat);
-		if ($search_total_ttc != '') $param .= '&search_total_ttc='.urlencode($search_total_ttc);
-		if ($search_project_ref >= 0)  	$param .= "&search_project_ref=".urlencode($search_project_ref);
-		if ($show_files)            $param .= '&show_files='.urlencode($show_files);
-		if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
-		if ($billed != '')			$param .= '&billed='.urlencode($billed);
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+			$param .= '&contextpage='.urlencode($contextpage);
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit='.urlencode($limit);
+		}
+		if ($sall) {
+			$param .= '&sall='.urlencode($sall);
+		}
+		if ($socid > 0) {
+			$param .= '&socid='.urlencode($socid);
+		}
+		if ($search_status != '') {
+			$param .= '&search_status='.urlencode($search_status);
+		}
+		if ($search_orderday) {
+			$param .= '&search_orderday='.urlencode($search_orderday);
+		}
+		if ($search_ordermonth) {
+			$param .= '&search_ordermonth='.urlencode($search_ordermonth);
+		}
+		if ($search_orderyear) {
+			$param .= '&search_orderyear='.urlencode($search_orderyear);
+		}
+		if ($search_deliveryday) {
+			$param .= '&search_deliveryday='.urlencode($search_deliveryday);
+		}
+		if ($search_deliverymonth) {
+			$param .= '&search_deliverymonth='.urlencode($search_deliverymonth);
+		}
+		if ($search_deliveryyear) {
+			$param .= '&search_deliveryyear='.urlencode($search_deliveryyear);
+		}
+		if ($search_ref) {
+			$param .= '&search_ref='.urlencode($search_ref);
+		}
+		if ($search_company) {
+			$param .= '&search_company='.urlencode($search_company);
+		}
+		if ($search_ref_customer) {
+			$param .= '&search_ref_customer='.urlencode($search_ref_customer);
+		}
+		if ($search_user > 0) {
+			$param .= '&search_user='.urlencode($search_user);
+		}
+		if ($search_sale > 0) {
+			$param .= '&search_sale='.urlencode($search_sale);
+		}
+		if ($search_total_ht != '') {
+			$param .= '&search_total_ht='.urlencode($search_total_ht);
+		}
+		if ($search_total_vat != '') {
+			$param .= '&search_total_vat='.urlencode($search_total_vat);
+		}
+		if ($search_total_ttc != '') {
+			$param .= '&search_total_ttc='.urlencode($search_total_ttc);
+		}
+		if ($search_project_ref >= 0) {
+			$param .= "&search_project_ref=".urlencode($search_project_ref);
+		}
+		if ($show_files) {
+			$param .= '&show_files='.urlencode($show_files);
+		}
+		if ($optioncss != '') {
+			$param .= '&optioncss='.urlencode($optioncss);
+		}
+		if ($billed != '') {
+			$param .= '&billed='.urlencode($billed);
+		}
 
 		header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
 		exit;
@@ -869,8 +1038,9 @@ 
 	foreach ($orders as $id_order)
 	{
 		$cmd = new Commande($db);
-		if ($cmd->fetch($id_order) <= 0)
-			continue;
+		if ($cmd->fetch($id_order) <= 0) {
+					continue;
+		}
 
 		if ($cmd->statut != Commande::STATUS_VALIDATED)
 		{
@@ -888,13 +1058,17 @@ 
 			setEventMessages($cmd->error, $cmd->errors, 'errors');
 			$error++;
 			break;
-		} else $nbok++;
+		} else {
+			$nbok++;
+		}
 	}
 	if (!$error)
 	{
-		if ($nbok > 1)
+		if ($nbok > 1) {
+					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		} else {
 			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		}
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -932,8 +1106,13 @@ 
 	}
 
 	$arrayofinclusion = array();
-	foreach ($listofobjectref as $tmppdf) $arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'\.pdf$';
-	foreach ($listofobjectref as $tmppdf) $arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'_[a-zA-Z0-9-_]+\.pdf$'; // To include PDF generated from ODX files
+	foreach ($listofobjectref as $tmppdf) {
+		$arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'\.pdf$';
+	}
+	foreach ($listofobjectref as $tmppdf) {
+		$arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'_[a-zA-Z0-9-_]+\.pdf$';
+	}
+	// To include PDF generated from ODX files
 	$listoffiles = dol_dir_list($uploaddir, 'all', 1, implode('|', $arrayofinclusion), '\.meta$|\.png', 'date', SORT_DESC, 0, true);
 
 	// build list of files with full path
@@ -954,8 +1133,12 @@ 
 	// Define output language (Here it is not used because we do only merging existing PDF)
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $objecttmp->thirdparty->default_lang;
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+		$newlang = GETPOST('lang_id', 'aZ09');
+	}
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+		$newlang = $objecttmp->thirdparty->default_lang;
+	}
 	if (!empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
@@ -973,11 +1156,18 @@ 
 		// Save merged file
 		if (in_array($objecttmp->element, array('facture', 'facture_fournisseur')) && $search_status == Facture::STATUS_VALIDATED)
 		{
-			if ($option == 'late') $filename .= '_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
-			else $filename .= '_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+			if ($option == 'late') {
+				$filename .= '_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+			} else {
+				$filename .= '_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+			}
+		}
+		if ($year) {
+			$filename .= '_'.$year;
+		}
+		if ($month) {
+			$filename .= '_'.$month;
 		}
-		if ($year) $filename .= '_'.$year;
-		if ($month) $filename .= '_'.$month;
 
 		if (count($files) > 0)
 		{
@@ -994,8 +1184,9 @@ 
 
 			// check if pdftk is installed
 			if (file_exists($file)) {
-				if (!empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (!empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$langs->load("exports");
 				setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
@@ -1021,7 +1212,9 @@ 
 		}
 		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+			$pdf->SetCompression(false);
+		}
 
 		// Add all others
 		foreach ($files as $file)
@@ -1047,18 +1240,26 @@ 
 		// Save merged file
 		if (in_array($objecttmp->element, array('facture', 'facture_fournisseur')) && $search_status == Facture::STATUS_VALIDATED)
 		{
-			if ($option == 'late') $filename .= '_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
-			else $filename .= '_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+			if ($option == 'late') {
+				$filename .= '_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+			} else {
+				$filename .= '_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+			}
+		}
+		if ($year) {
+			$filename .= '_'.$year;
+		}
+		if ($month) {
+			$filename .= '_'.$month;
 		}
-		if ($year) $filename .= '_'.$year;
-		if ($month) $filename .= '_'.$month;
 		if ($pagecount)
 		{
 			$now = dol_now();
 			$file = $diroutputmassaction.'/'.$filename.'_'.dol_print_date($now, 'dayhourlog').'.pdf';
 			$pdf->Output($file, 'F');
-			if (!empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+			if (!empty($conf->global->MAIN_UMASK)) {
+							@chmod($file, octdec($conf->global->MAIN_UMASK));
+			}
 
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
@@ -1077,8 +1278,11 @@ 
 	$upload_dir = $diroutputmassaction;
 	$file = $upload_dir.'/'.GETPOST('file');
 	$ret = dol_delete_file($file);
-	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+	if ($ret) {
+		setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+	}
 	$action = '';
 }
 
@@ -1121,7 +1325,9 @@ 
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
-				} else $nbok++;
+				} else {
+					$nbok++;
+				}
 			} else {
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
@@ -1131,8 +1337,11 @@ 
 
 		if (!$error)
 		{
-			if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-			else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			if ($nbok > 1) {
+				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			} else {
+				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			}
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -1155,7 +1364,9 @@ 
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
-			} else $nbok++;
+			} else {
+				$nbok++;
+			}
 		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
@@ -1164,9 +1375,11 @@ 
 	}
 
 	if (!$error) {
-		if ($nbok > 1)
+		if ($nbok > 1) {
+					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		} else {
 			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		}
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -1208,15 +1421,20 @@ 
 				}
 			}
 
-			if (in_array($objecttmp->element, array('societe', 'member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
-			else $result = $objecttmp->delete($user);
+			if (in_array($objecttmp->element, array('societe', 'member'))) {
+				$result = $objecttmp->delete($objecttmp->id, $user, 1);
+			} else {
+				$result = $objecttmp->delete($user);
+			}
 
 			if ($result <= 0)
 			{
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
-			} else $nbok++;
+			} else {
+				$nbok++;
+			}
 		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
@@ -1226,8 +1444,11 @@ 
 
 	if (!$error)
 	{
-		if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
-		else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+		}
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -1251,9 +1472,17 @@ 
 			$outputlangs = $langs;
 			$newlang = '';
 
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->thirdparty->default_lang)) $newlang = $objecttmp->thirdparty->default_lang; // for proposal, order, invoice, ...
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->default_lang)) $newlang = $objecttmp->default_lang; // for thirdparty
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+				$newlang = GETPOST('lang_id', 'aZ09');
+			}
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->thirdparty->default_lang)) {
+				$newlang = $objecttmp->thirdparty->default_lang;
+			}
+			// for proposal, order, invoice, ...
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->default_lang)) {
+				$newlang = $objecttmp->default_lang;
+			}
+			// for thirdparty
 			if (!empty($newlang))
 			{
 				$outputlangs = new Translate("", $conf);
@@ -1261,10 +1490,18 @@ 
 			}
 
 			// To be sure vars is defined
-			if (empty($hidedetails)) $hidedetails = 0;
-			if (empty($hidedesc)) $hidedesc = 0;
-			if (empty($hideref)) $hideref = 0;
-			if (empty($moreparams)) $moreparams = null;
+			if (empty($hidedetails)) {
+				$hidedetails = 0;
+			}
+			if (empty($hidedesc)) {
+				$hidedesc = 0;
+			}
+			if (empty($hideref)) {
+				$hideref = 0;
+			}
+			if (empty($moreparams)) {
+				$moreparams = null;
+			}
 
 			$result = $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 
@@ -1273,7 +1510,9 @@ 
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
-			} else $nbok++;
+			} else {
+				$nbok++;
+			}
 		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
@@ -1283,8 +1522,11 @@ 
 
 	if (!$error)
 	{
-		if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
-		else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
+		}
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -1340,8 +1582,11 @@ 
 
 	if (!$error)
 	{
-		if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null);
-		else setEventMessages($langs->trans("RecordsModified", $nbok), null);
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsModified", $nbok), null);
+		} else {
+			setEventMessages($langs->trans("RecordsModified", $nbok), null);
+		}
 		$db->commit();
 		$toselect=array();
 	} else {
@@ -1355,4 +1600,6 @@ 
 $parameters['diroutputmassaction'] = $diroutputmassaction;
 
 $reshook = $hookmanager->executeHooks('doMassActions', $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');
+}

htdocs/core/class/commonobject.class.php

Spacing +5 added lines, -5 removed lines

@@ -2955,7 +2955,7 @@ 
 		// Special cas
 		if ($this->table_element == 'product' && $newsuffix == '_private') $newsuffix = '';
 		if (in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
-			$fieldusermod =  "fk_user_mod";
+			$fieldusermod = "fk_user_mod";
 		} elseif ($this->table_element == 'ecm_files') {
 			$fieldusermod = "fk_user_m";
 		} else {
@@ -8427,12 +8427,12 @@ 
 		}
 
 		$error = 0;
-		$ok=0;
+		$ok = 0;
 
 		// Process
 		foreach ($to_del as $del) {
 			if ($c->fetch($del) > 0) {
-				$result=$c->del_type($this, $type_categ);
+				$result = $c->del_type($this, $type_categ);
 				if ($result < 0)
 				{
 					$error++;
@@ -8440,7 +8440,7 @@ 
 					$this->errors = $c->errors;
 					break;
 				} else {
-					$ok+=$result;
+					$ok += $result;
 				}
 			}
 		}
@@ -8455,7 +8455,7 @@ 
 					$this->errors = $c->errors;
 					break;
 				} else {
-					$ok+=$result;
+					$ok += $result;
 				}
 			}
 		}

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

Braces +1541 added lines, -545 removed lines

@@ -117,40 +117,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;
@@ -181,12 +211,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 {
 			$editmode = (GETPOST('action', 'aZ09') == 'edit'.$htmlname);
 			if ($editmode)
@@ -196,8 +230,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);
@@ -207,9 +245,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].'"' : '').' autofocus>';
-				} 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))
@@ -249,26 +289,43 @@ 
 					$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 button-cancel'.(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 (preg_match('/^restricthtml/', $typeofdata)) $ret .= dol_string_onlythesehtmltags($value);
-				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret .= '<span class="valuedate">'.dol_print_date($value, 'day').'</span>';
-				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret .= '<span class="valuedate">'.dol_print_date($value, 'dayhour').'</span>';
-				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 (preg_match('/^restricthtml/', $typeofdata)) {
+					$ret .= dol_string_onlythesehtmltags($value);
+				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {
+					$ret .= '<span class="valuedate">'.dol_print_date($value, 'day').'</span>';
+				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {
+					$ret .= '<span class="valuedate">'.dol_print_date($value, 'dayhour').'</span>';
+				} elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
@@ -322,7 +379,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)) {
@@ -394,9 +453,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)
 		{
@@ -425,23 +488,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);
@@ -452,9 +527,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))
 				{
@@ -468,17 +549,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";
@@ -513,12 +602,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);
 
@@ -540,17 +637,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;
@@ -561,15 +677,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;
 	}
@@ -593,17 +716,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 = '';
 			}
@@ -612,7 +741,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))
@@ -621,13 +752,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);
 	}
@@ -655,7 +795,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>';
@@ -668,7 +810,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 +938,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 +966,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;
@@ -826,8 +984,11 @@ 
 					}
 
 					$labeltoshow = '';
-					if ($row['label']) $labeltoshow .= dol_trunc($row['label'], $maxlength, 'middle');
-					else $labeltoshow .= '&nbsp;';
+					if ($row['label']) {
+						$labeltoshow .= dol_trunc($row['label'], $maxlength, 'middle');
+					} else {
+						$labeltoshow .= '&nbsp;';
+					}
 					if ($row['code_iso']) {
 						$labeltoshow .= ' <span class="opacitymedium">('.$row['code_iso'].')</span>';
 						$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium marginrightonly"');
@@ -925,7 +1086,9 @@ 
 						$out .= '<option value="'.$row['rowid'].'">';
 					}
 
-					if ($row['code']) $out .= $row['code'];
+					if ($row['code']) {
+						$out .= $row['code'];
+					}
 
 					$out .= '</option>';
 				}
@@ -966,21 +1129,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>';
@@ -996,9 +1167,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
 		}
 	}
 
@@ -1014,7 +1188,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);
 
@@ -1071,21 +1248,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);
+		}
 	}
 
 
@@ -1132,8 +1315,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');
@@ -1180,8 +1364,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')) {
@@ -1200,12 +1387,22 @@ 
 		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid = s.fk_pays";
 		}
-		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";
+		}
 		$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 != '')
 		{
@@ -1214,13 +1411,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)."%'";
@@ -1250,10 +1453,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" data-html="'.dol_escape_htmltag('<span class="opacitymedium">'.$textifempty.'</span>').'">'.$textifempty.'</option>'."\n";
 			}
-			if ($showempty) $out .= '<option value="-1" data-html="'.dol_escape_htmltag('<span class="opacitymedium">'.$textifempty.'</span>').'">'.$textifempty.'</option>'."\n";
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -1281,11 +1489,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 (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
@@ -1308,7 +1526,9 @@ 
 					}
 
 					$i++;
-					if (($i % 10) == 0) $out .= "\n";
+					if (($i % 10) == 0) {
+						$out .= "\n";
+					}
 				}
 			}
 			$out .= '</select>'."\n";
@@ -1318,7 +1538,9 @@ 
 
 		$this->result = array('nbofthirdparties'=>$num);
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -1345,7 +1567,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);
@@ -1365,13 +1589,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)
@@ -1383,7 +1617,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>';
@@ -1456,11 +1692,16 @@ 
 
 		$langs->load('companies');
 
-		if (empty($htmlid)) $htmlid = $htmlname;
+		if (empty($htmlid)) {
+			$htmlid = $htmlname;
+		}
 		$num = 0;
 
-		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))
@@ -1471,12 +1712,20 @@ 
 
 		// We search third parties
 		$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste, sp.email, sp.phone, sp.phone_perso, sp.phone_mobile, sp.town AS contact_town";
-		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) $sql .= ", s.nom as company, s.town AS company_town";
+		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
+			$sql .= ", s.nom as company, s.town AS company_town";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) $sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";
+		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
+			$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);
@@ -1495,8 +1744,12 @@ 
 				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($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 (($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>';
+			}
 
 			$i = 0;
 			if ($num)
@@ -1513,21 +1766,33 @@ 
 					if (!empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
 						$extendedInfos = array();
 						$email = trim($obj->email);
-						if (!empty($email)) $extendedInfos[] = $email;
-						else {
+						if (!empty($email)) {
+							$extendedInfos[] = $email;
+						} else {
 							$phone = trim($obj->phone);
 							$phone_perso = trim($obj->phone_perso);
 							$phone_mobile = trim($obj->phone_mobile);
-							if (!empty($phone)) $extendedInfos[] = $phone;
-							if (!empty($phone_perso)) $extendedInfos[] = $phone_perso;
-							if (!empty($phone_mobile)) $extendedInfos[] = $phone_mobile;
+							if (!empty($phone)) {
+								$extendedInfos[] = $phone;
+							}
+							if (!empty($phone_perso)) {
+								$extendedInfos[] = $phone_perso;
+							}
+							if (!empty($phone_mobile)) {
+								$extendedInfos[] = $phone_mobile;
+							}
 						}
 						$contact_town = trim($obj->contact_town);
 						$company_town = trim($obj->company_town);
-						if (!empty($contact_town)) $extendedInfos[] = $contact_town;
-						elseif (!empty($company_town)) $extendedInfos[] = $company_town;
+						if (!empty($contact_town)) {
+							$extendedInfos[] = $contact_town;
+						} elseif (!empty($company_town)) {
+							$extendedInfos[] = $company_town;
+						}
 						$extendedInfos = implode(' - ', $extendedInfos);
-						if (!empty($extendedInfos)) $extendedInfos = ' - '.$extendedInfos;
+						if (!empty($extendedInfos)) {
+							$extendedInfos = ' - '.$extendedInfos;
+						}
 					}
 
 					$contactstatic->id = $obj->rowid;
@@ -1537,32 +1802,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).$extendedInfos;
-								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).$extendedInfos;
-								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).$extendedInfos;
-								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.')';
+								}
 							}
 						}
 					}
@@ -1651,19 +1936,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));
@@ -1686,8 +1979,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))
 			{
@@ -1698,19 +1994,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";
 		}
@@ -1729,8 +2039,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 ? ' '.$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);
 
@@ -1747,7 +2061,9 @@ 
 					$userstatic->admin = $obj->admin;
 
 					$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');
+					}
 
 					$labeltoshow = '';
 
@@ -1758,7 +2074,9 @@ 
 						$fullNameMode = 1; //Firstname+lastname
 					}
 					$labeltoshow .= $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);
-					if (empty($obj->firstname) && empty($obj->lastname)) $labeltoshow .= $obj->login;
+					if (empty($obj->firstname) && empty($obj->lastname)) {
+						$labeltoshow .= $obj->login;
+					}
 
 					// Complete name with more info
 					$moreinfo = '';
@@ -1794,7 +2112,9 @@ 
 					$labeltoshow .= $moreinfo;
 
 					$out .= '<option value="'.$obj->rowid.'"';
-					if ($disableline) $out .= ' disabled';
+					if ($disableline) {
+						$out .= ' disabled';
+					}
 					if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected))) {
 						$out .= ' selected';
 					}
@@ -1804,9 +2124,13 @@ 
 					{
 						$outhtml .= $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
 					}
-					if ($showstatus >= 0 && $obj->status == 0) $outhtml .= '<strike class="opacitymediumxxx">';
+					if ($showstatus >= 0 && $obj->status == 0) {
+						$outhtml .= '<strike class="opacitymediumxxx">';
+					}
 					$outhtml .= $labeltoshow;
-					if ($showstatus >= 0 && $obj->status == 0) $outhtml .= '</strike>';
+					if ($showstatus >= 0 && $obj->status == 0) {
+						$outhtml .= '</strike>';
+					}
 					$out .= dol_escape_htmltag($outhtml);
 					$out .= '">';
 					$out .= $labeltoshow;
@@ -1825,7 +2149,9 @@ 
 			dol_print_error($this->db);
 		}
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -1870,11 +2196,15 @@ 
 		$nbassignetouser = count($assignedtouser);
 
 		//if ($nbassignetouser && $action != 'view') $out .= '<br>';
-		if ($nbassignetouser) $out .= '<ul class="attendees">';
+		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']);
@@ -1900,7 +2230,9 @@ 
 			$out .= '</li>';
 			$i++;
 		}
-		if ($nbassignetouser) $out .= '</ul>';
+		if ($nbassignetouser) {
+			$out .= '</ul>';
+		}
 
 		// Method with no ajax
 		if ($action != 'view')
@@ -1958,7 +2290,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)) {
@@ -2069,8 +2403,9 @@ 
                 ';
 			}
 
-			if (empty($hidelabel)) $out .= $langs->trans("RefOrLabel").' : ';
-			elseif ($hidelabel > 1) {
+			if (empty($hidelabel)) {
+				$out .= $langs->trans("RefOrLabel").' : ';
+			} elseif ($hidelabel > 1) {
 				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
 				if ($hidelabel == 2) {
 					$out .= img_picto($langs->trans("Search"), 'search');
@@ -2084,8 +2419,11 @@ 
 			$out .= $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
 		}
 
-		if (empty($nooutput)) print $out;
-		else return $out;
+		if (empty($nooutput)) {
+			print $out;
+		} else {
+			return $out;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2188,11 +2526,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";
@@ -2241,14 +2583,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";
@@ -2261,23 +2606,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 '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%'";
-				if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.label LIKE '".$this->db->escape($prefix.$crit)."%'";
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
+					$sql .= " OR pl.label LIKE '".$this->db->escape($prefix.$crit)."%'";
+				}
 				if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION))
 				{
 					$sql .= " OR p.description LIKE '".$this->db->escape($prefix.$crit)."%'";
-					if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.description LIKE '".$this->db->escape($prefix.$crit)."%'";
+					if (!empty($conf->global->MAIN_MULTILANGS)) {
+						$sql .= " OR pl.description LIKE '".$this->db->escape($prefix.$crit)."%'";
+					}
+				}
+				if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {
+					$sql .= " OR pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%'";
 				}
-				if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) $sql .= " OR pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%'";
 				$sql .= ")";
 				$i++;
 			}
-			if (count($scrit) > 1) $sql .= ")";
-			if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+			if (count($scrit) > 1) {
+				$sql .= ")";
+			}
+			if (!empty($conf->barcode->enabled)) {
+				$sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+			}
 			$sql .= ')';
 		}
 		if (count($warehouseStatusArray))
@@ -2323,12 +2682,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)
@@ -2406,7 +2772,9 @@ 
 
 			$this->db->free($result);
 
-			if (empty($outputmode)) return $out;
+			if (empty($outputmode)) {
+				return $out;
+			}
 			return $outarray;
 		} else {
 			dol_print_error($db);
@@ -2449,8 +2817,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;
@@ -2464,7 +2836,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 = '';
@@ -2513,22 +2887,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;
@@ -2661,9 +3048,11 @@ 
 				}
 				$outval .= $langs->transnoentities("Stock").': '.price(price2num($objp->stock, 'MS'));
 				$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)
@@ -2774,10 +3163,14 @@ 
 		if (!empty($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 (!empty($conf->global->PRODUCT_USE_UNITS)) {
@@ -2785,8 +3178,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 != '')
 		{
@@ -2795,14 +3192,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)."%'";
@@ -2825,8 +3228,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)
@@ -2834,7 +3240,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 = '';
@@ -2882,11 +3291,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)) {
@@ -2973,9 +3388,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
 					{
@@ -2998,9 +3415,11 @@ 
 						}
 						$optlabel .= $langs->transnoentities("Stock").':'.price(price2num($objp->stock, 'MS'));
 						$optlabel .= '</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)
@@ -3024,8 +3443,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.'"';
@@ -3062,7 +3485,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);
@@ -3160,7 +3585,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;
@@ -3200,7 +3627,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)
@@ -3238,7 +3667,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);
 
@@ -3285,7 +3717,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);
 
@@ -3339,7 +3774,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)
@@ -3352,7 +3789,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);
+		}
 		print ajax_combobox($htmlname);
 	}
 
@@ -3366,7 +3805,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';
@@ -3384,8 +3826,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;
@@ -3420,10 +3868,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']))
 			{
@@ -3436,7 +3888,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);
+		}
 		print ajax_combobox('select_'.$htmlname);
 	}
 
@@ -3452,7 +3906,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);
 
@@ -3516,10 +3973,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)
@@ -3532,7 +3993,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);
+		}
 		print ajax_combobox($htmlname);
 	}
 
@@ -3561,48 +4024,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);
+		}
 		print ajax_combobox('select'.$htmlname);
 	}
 
@@ -3635,7 +4128,9 @@ 
 			$return .= '</option>';
 		}
 		$return .= '</select>';
-		if ($addjscombo) $return .= ajax_combobox('select_'.$htmlname);
+		if ($addjscombo) {
+			$return .= ajax_combobox('select_'.$htmlname);
+		}
 
 		return $return;
 	}
@@ -3652,7 +4147,10 @@ 
 		global $langs;
 
 		$num = count($this->cache_transport_mode);
-		if ($num > 0) return $num; // Cache already loaded
+		if ($num > 0) {
+			return $num;
+		}
+		// Cache already loaded
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -3684,8 +4182,7 @@ 
 			$this->cache_transport_mode = dol_sort_array($this->cache_transport_mode, 'label', 'asc', 0, 0, 1);
 
 			return $num;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3713,32 +4210,53 @@ 
 		$this->load_cache_transport_mode();
 
 		print '<select id="select'.$htmlname.'" class="flat selectmodetransport'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
-		if ($empty) print '<option value="">&nbsp;</option>';
+		if ($empty) {
+			print '<option value="">&nbsp;</option>';
+		}
 		foreach ($this->cache_transport_mode as $id => $arraytypes)
 		{
 			// If not good status
-			if ($active >= 0 && $arraytypes['active'] != $active) continue;
+			if ($active >= 0 && $arraytypes['active'] != $active) {
+				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.'"';
+			}
 			// If text is selected, we compare with code, else with id
-			if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
-			elseif ($selected == $id) print ' selected';
+			if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) {
+				print ' selected';
+			} elseif ($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);
+		}
 	}
 
 	/**
@@ -3761,7 +4279,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);
@@ -3786,7 +4306,9 @@ 
 					$i++;
 				}
 				print "</select>";
-				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				if ($user->admin) {
+					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				}
 
 				print ajax_combobox('select'.$htmlname);
 			} else {
@@ -3906,15 +4428,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)
 				{
@@ -3956,8 +4482,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);
@@ -3984,24 +4514,34 @@ 
 						$out .= '<option value="'.$obj->rowid.'">';
 					}
 					$out .= trim($obj->label);
-					if ($showcurrency) $out .= ' ('.$obj->currency_code.')';
-					if ($status == 2 && $obj->status == 1) $out .= ' ('.$langs->trans("Closed").')';
+					if ($showcurrency) {
+						$out .= ' ('.$obj->currency_code.')';
+					}
+					if ($status == 2 && $obj->status == 1) {
+						$out .= ' ('.$langs->trans("Closed").')';
+					}
 					$out .= '</option>';
 					$i++;
 				}
 				$out .= "</select>";
 				$out .= ajax_combobox('select'.$htmlname);
 			} else {
-				if ($status == 0) $out .= '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
-				else $out .= '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
+				if ($status == 0) {
+					$out .= '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
+				} else {
+					$out .= '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
+				}
 			}
 		} else {
 			dol_print_error($this->db);
 		}
 
 		// Output or return
-		if (empty($nooutput)) print $out;
-		else return $out;
+		if (empty($nooutput)) {
+			print $out;
+		} else {
+			return $out;
+		}
 
 		return $num;
 	}
@@ -4028,8 +4568,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);
@@ -4056,14 +4600,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);
@@ -4087,7 +4636,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');
@@ -4096,7 +4647,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;";
 			}
@@ -4152,11 +4705,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);
@@ -4166,8 +4723,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)
 				{
@@ -4186,7 +4744,9 @@ 
 		$output .= '</select>';
 		$output .= "\n";
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $output;
 	}
 
@@ -4249,7 +4809,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)) {
@@ -4293,7 +4855,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')
@@ -4301,9 +4865,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')
@@ -4312,11 +4882,18 @@ 
 						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'.($i == 0 ? ' tdtop' : '').'"><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].$selkey.'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;
-							if ($input['disabled']) $more .= ' disabled';
-							if (isset($input['default']) && $input['default'] === $selkey) $more .= ' checked="checked"';
+							if ($input['disabled']) {
+								$more .= ' disabled';
+							}
+							if (isset($input['default']) && $input['default'] === $selkey) {
+								$more .= ' checked="checked"';
+							}
 							$more .= ' /> ';
 							$more .= '<label for="'.$input['name'].$selkey.'">'.$selval.'</label>';
 							$more .= '</div></div>'."\n";
@@ -4336,7 +4913,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')
@@ -4354,8 +4933,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)
 		{
@@ -4377,8 +4960,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.
@@ -4466,7 +5053,9 @@ 
 		} else {
 			$formconfirm .= "\n<!-- begin formconfirm page=".dol_escape_htmltag($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";
@@ -4500,7 +5089,9 @@ 
 
 			$formconfirm .= '</table>'."\n";
 
-			if (empty($disableformtag)) $formconfirm .= "</form>\n";
+			if (empty($disableformtag)) {
+				$formconfirm .= "</form>\n";
+			}
 			$formconfirm .= '<br>';
 
 			if (empty($conf->use_javascript_ajax)) {
@@ -4720,11 +5311,16 @@ 
 			$ret .= '<td class="left"><input type="submit" class="button smallpaddingimp" 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;
 	}
 
@@ -4823,8 +5419,7 @@ 
 			$this->selectTransportMode($selected, $htmlname, 2, $addempty, 0, 0, $active);
 			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else {
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_transport_mode();
@@ -4893,7 +5488,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;
 			}
@@ -4930,24 +5527,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))
 			{
@@ -4958,15 +5573,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 smallpaddingimp" 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 '>';
 				}
@@ -5076,8 +5695,11 @@ 
 			}
 		}
 
-		if ($nooutput) return $out;
-		else print $out;
+		if ($nooutput) {
+			return $out;
+		} else {
+			print $out;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -5111,7 +5733,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)
@@ -5134,7 +5759,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';
@@ -5163,16 +5790,22 @@ 
 
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
 		$sql .= " WHERE entity IN ('".getEntity('mutlicurrency')."')";
-		if ($filter) $sql .= " AND ".$filter;
+		if ($filter) {
+			$sql .= " AND ".$filter;
+		}
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj = $this->db->fetch_object($resql)) $TCurrency[$obj->code] = $obj->code;
+			while ($obj = $this->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) && !$excludeConfCurrency)
 		{
@@ -5184,8 +5817,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).')';
@@ -5215,7 +5851,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);
 
@@ -5247,10 +5886,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
 				}
 
@@ -5332,28 +5979,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."'";
 					}
+					}
 				}
 			}
 		}
@@ -5373,15 +6028,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
@@ -5397,28 +6057,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)
@@ -5441,7 +6111,9 @@ 
 				$return .= '</option>';
 			}
 
-			if (!$options_only) $return .= '</select>';
+			if (!$options_only) {
+				$return .= '</select>';
+			}
 		} else {
 			$return .= $this->error;
 		}
@@ -5541,12 +6213,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;
@@ -5559,10 +6239,12 @@ 
 
 		// Analysis of the pre-selection date
 		$reg = array();
-		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] : '');
@@ -5592,8 +6274,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';
@@ -5630,7 +6316,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";
@@ -5762,31 +6450,43 @@ 
 				$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;
 				//$retstring .= (empty($conf->dol_optimize_smallscreen) ? '' : 'H');
 				$retstring .= '</option>';
 			}
 			$retstring .= '</select>';
 			//if ($m && empty($conf->dol_optimize_smallscreen)) $retstring .= ":";
-			if ($m) $retstring .= ":";
+			if ($m) {
+				$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>';
@@ -5803,7 +6503,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) {
@@ -5813,11 +6514,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').'\');';
@@ -5849,7 +6553,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)
 				{
@@ -5861,12 +6567,16 @@ 
 					$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').change();';
 				}
 
-				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)
 				{
@@ -5877,7 +6587,9 @@ 
 					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(d.getMinutes().pad());';
 					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').change();';
 				}
-				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))
@@ -5902,16 +6614,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))
@@ -5926,7 +6646,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>';
 		}
 
@@ -6008,9 +6730,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";
@@ -6024,12 +6748,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')
 		{
@@ -6037,7 +6767,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>";
@@ -6046,11 +6778,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;
@@ -6111,8 +6847,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);
@@ -6136,7 +6876,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
@@ -6157,9 +6899,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();
@@ -6197,18 +6943,28 @@ 
 		//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 (!dol_eval($val['enabled'], 1, 1)) continue;
-				if ($val['showoncombobox']) $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;
+				if (!dol_eval($val['enabled'], 1, 1)) {
+					continue;
+				}
+				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);
@@ -6236,20 +6992,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))
@@ -6276,10 +7042,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;
@@ -6307,7 +7078,9 @@ 
 					}
 
 					$i++;
-					if (($i % 10) == 0) $out .= "\n";
+					if (($i % 10) == 0) {
+						$out .= "\n";
+					}
 				}
 			}
 
@@ -6323,7 +7096,9 @@ 
 
 		$this->result = array('nbofelement'=>$num);
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -6360,7 +7135,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 = '';
 
@@ -6382,8 +7159,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";
 		}
 
@@ -6394,14 +7176,20 @@ 
 			{
 				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)
 			{
@@ -6425,28 +7213,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 .= '>';
@@ -6485,7 +7291,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>';
 
@@ -6585,7 +7393,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>';
 
@@ -6701,8 +7511,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
@@ -6994,25 +7807,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 = 'delivery';
-					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') {
@@ -7031,9 +7865,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;
 					}
 
@@ -7082,19 +7918,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);
 			}
 
@@ -7117,9 +7959,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))
@@ -7140,7 +7985,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)))
 			{
@@ -7196,9 +8043,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>';
+				}
 			}
 		}
 
@@ -7207,7 +8058,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.'
@@ -7261,7 +8114,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";
@@ -7350,8 +8205,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))
@@ -7370,9 +8229,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';
 				}
 			}
@@ -7398,7 +8259,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)
 		{
@@ -7420,20 +8283,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>';
@@ -7446,7 +8322,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)) {
@@ -7530,14 +8408,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
@@ -7575,9 +8457,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;
@@ -7585,9 +8473,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;
@@ -7596,24 +8488,38 @@ 
 			$dir = $conf->user->dir_output;
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
+				if ((string) $imagesize == 'mini') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
+				} elseif ((string) $imagesize == 'small') {
+					$file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
+				} else {
+					$file = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
+				}
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').$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')	{
 			$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 {
@@ -7621,16 +8527,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)
 		{
@@ -7638,19 +8553,29 @@ 
 			{
 				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
@@ -7658,8 +8583,12 @@ 
 						$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';
+						}
 					}
 				}
 
@@ -7677,13 +8606,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;
 	}
@@ -7711,11 +8646,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 = '';
 
@@ -7729,13 +8670,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);
@@ -7752,16 +8700,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';
@@ -7778,7 +8732,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>';
@@ -7819,7 +8775,9 @@ 
 
 		$out = '';
 
-		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() {
@@ -7832,7 +8790,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() {
 					$(this).closest("tr").toggleClass("highlight", this.checked);
@@ -7882,14 +8842,18 @@ 
 		$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 maxwidth200">';
-			if ($useempty) $out .= '<option value="0">&nbsp;</option>';
+			if ($useempty) {
+				$out .= '<option value="0">&nbsp;</option>';
+			}
 
 			while ($obj = $db->fetch_object($resql))
 			{
@@ -7898,7 +8862,9 @@ 
 			$out .= '</select>';
 			$out .= ajax_combobox('select_'.$htmlname);
 
-			if (!empty($htmlname) && $user->admin && $info_admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if (!empty($htmlname) && $user->admin && $info_admin) {
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 
 			if (!empty($target))
 			{
@@ -7914,7 +8880,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();
@@ -7977,7 +8945,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))
 			{
@@ -8013,11 +8983,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))
 			{
@@ -8064,7 +9040,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))
 		{
@@ -8106,8 +9084,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);
@@ -8133,7 +9114,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)
@@ -8142,7 +9126,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))
 							{
@@ -8162,7 +9148,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 .= '>';
@@ -8219,8 +9207,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">';
@@ -8262,7 +9254,9 @@ 
 		$formmail = new FormMail($db);
 		$result = $formmail->fetchAllEMailTemplate($modelType, $user, $langs);
 
-		if ($default) $TModels[0] = $langs->trans('DefaultMailModel');
+		if ($default) {
+			$TModels[0] = $langs->trans('DefaultMailModel');
+		}
 		if ($result > 0) {
 			foreach ($formmail->lines_model as $model) {
 				$TModels[$model->id] = $model->label;
@@ -8278,7 +9272,9 @@ 
 
 		$retstring .= "</select>";
 
-		if ($addjscombo) $retstring .= ajax_combobox('select_'.$prefix.'model_mail');
+		if ($addjscombo) {
+			$retstring .= ajax_combobox('select_'.$prefix.'model_mail');
+		}
 
 		return $retstring;
 	}

htdocs/core/lib/prelevement.lib.php

Spacing +2 added lines, -2 removed lines

@@ -85,11 +85,11 @@
 function prelevement_check_config($type = 'direct-debit')
 {
 	global $conf, $db;
-	if ($type == 'bank-transfer'){
+	if ($type == 'bank-transfer') {
 		if (empty($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT)) return -1;
 		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
 		if (empty($conf->global->PAYMENTBYBANKTRANSFER_USER)) return -1;
-	}else {
+	} else {
 		if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
 		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
 		if (empty($conf->global->PRELEVEMENT_USER)) return -1;

Braces +13 added lines, -5 removed lines

@@ -86,13 +86,21 @@
 {
 	global $conf, $db;
 	if ($type == 'bank-transfer'){
-		if (empty($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT)) return -1;
+		if (empty($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT)) {
+			return -1;
+		}
 		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
-		if (empty($conf->global->PAYMENTBYBANKTRANSFER_USER)) return -1;
-	}else {
-		if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
+		if (empty($conf->global->PAYMENTBYBANKTRANSFER_USER)) {
+			return -1;
+		}
+	} else {
+		if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) {
+			return -1;
+		}
 		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
-		if (empty($conf->global->PRELEVEMENT_USER)) return -1;
+		if (empty($conf->global->PRELEVEMENT_USER)) {
+			return -1;
+		}
 	}
 	return 0;
 }

htdocs/fichinter/class/fichinterrec.class.php

Braces +41 added lines, -18 removed lines

@@ -239,13 +239,14 @@ 
 						$fichintsrc->lines[$i]->fk_unit
 					);
 
-					if ($result_insert < 0)
-						$error++;
+					if ($result_insert < 0) {
+											$error++;
+					}
 				}
 
-				if ($error)
-					$this->db->rollback();
-				else {
+				if ($error) {
+									$this->db->rollback();
+				} else {
 					$this->db->commit();
 					return $this->id;
 				}
@@ -277,8 +278,11 @@ 
 		$sql .= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.auto_validate';
 		$sql .= ', f.note_private, f.note_public, f.fk_user_author';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter_rec as f';
-		if ($rowid > 0) $sql .= ' WHERE f.rowid='.$rowid;
-		elseif ($ref) $sql .= " WHERE f.titre='".$this->db->escape($ref)."'";
+		if ($rowid > 0) {
+			$sql .= ' WHERE f.rowid='.$rowid;
+		} elseif ($ref) {
+			$sql .= " WHERE f.titre='".$this->db->escape($ref)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch rowid=".$rowid, LOG_DEBUG);
 
@@ -421,7 +425,9 @@ 
 	 */
 	public function delete($rowid = 0, $notrigger = 0, $idwarehouse = -1)
 	{
-		if (empty($rowid)) $rowid = $this->id;
+		if (empty($rowid)) {
+			$rowid = $this->id;
+		}
 
 		dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
 
@@ -481,14 +487,20 @@ 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		// Check parameters
-		if ($type < 0) return -1;
+		if ($type < 0) {
+			return -1;
+		}
 
 		if ($this->brouillon) {
 			// Clean parameters
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
-			if (!$qty) $qty = 1;
-			if (!$info_bits) $info_bits = 0;
+			if (!$qty) {
+				$qty = 1;
+			}
+			if (!$info_bits) {
+				$info_bits = 0;
+			}
 			$pu_ht = price2num($pu_ht);
 			$pu_ttc = price2num($pu_ttc);
 			if (!preg_match('/\((.*)\)/', $txtva)) {
@@ -623,7 +635,9 @@ 
 
 		$url = DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$this->id;
 
-		if ($short) return $url;
+		if ($short) {
+			return $url;
+		}
 
 		$picto = 'intervention';
 
@@ -709,7 +723,9 @@ 
 		dol_syslog(get_class($this)."::setFrequencyAndUnit", LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			$this->frequency = $frequency;
-			if (!empty($unit)) $this->unit_frequency = $unit;
+			if (!empty($unit)) {
+				$this->unit_frequency = $unit;
+			}
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -732,13 +748,17 @@ 
 		}
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET date_when = ".($date ? "'".$this->db->idate($date)."'" : "null");
-		if ($increment_nb_gen_done > 0) $sql .= ', nb_gen_done = nb_gen_done + 1';
+		if ($increment_nb_gen_done > 0) {
+			$sql .= ', nb_gen_done = nb_gen_done + 1';
+		}
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this)."::setNextDate", LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			$this->date_when = $date;
-			if ($increment_nb_gen_done > 0) $this->nb_gen_done++;
+			if ($increment_nb_gen_done > 0) {
+				$this->nb_gen_done++;
+			}
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -759,7 +779,9 @@ 
 			return -1;
 		}
 
-		if (empty($nb)) $nb = 0;
+		if (empty($nb)) {
+			$nb = 0;
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= ' SET nb_gen_max = '.$nb;
@@ -818,8 +840,9 @@ 
 		$sql .= ' SET nb_gen_done = nb_gen_done + 1';
 		$sql .= ' , date_last_gen = now()';
 		// si on et arrivé à la fin des génération
-		if ($this->nb_gen_max == $this->nb_gen_done + 1)
-			$sql .= ' , statut = 1';
+		if ($this->nb_gen_max == $this->nb_gen_done + 1) {
+					$sql .= ' , statut = 1';
+		}
 
 		$sql .= ' WHERE rowid = '.$this->id;
 

htdocs/adherents/list.php

Spacing +1 added lines, -1 removed lines

@@ -408,7 +408,7 @@
 if ($user->rights->adherent->creer) $arrayofmassactions['close'] = $langs->trans("Resiliate");
 if ($user->rights->adherent->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
+if (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';

Braces +348 added lines, -116 removed lines

@@ -69,13 +69,21 @@ 
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $filter = GETPOST("filter", 'alpha');
-if ($filter) $search_filter = $filter; // For backward compatibility
+if ($filter) {
+	$search_filter = $filter;
+}
+// For backward compatibility
 $statut = GETPOST("statut", 'alpha');
-if ($statut != '') $search_status = $statut; // For backward compatibility
+if ($statut != '') {
+	$search_status = $statut;
+}
+// For backward compatibility
 
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
-if ($search_status < -1) $search_status = '';
+if ($search_status < -1) {
+	$search_status = '';
+}
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -117,7 +125,9 @@ 
 	'd.note_public'=>'NotePublic',
 	'd.note_private'=>'NotePrivate',
 );
-if ($db->type == 'pgsql') unset($fieldstosearchall['d.rowid']);
+if ($db->type == 'pgsql') {
+	unset($fieldstosearchall['d.rowid']);
+}
 $arrayfields = array(
 	'd.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
 	'd.civility'=>array('label'=>$langs->trans("Civility"), 'checked'=>0),
@@ -158,7 +168,9 @@ 
 
 $parameters = array('socid'=>$socid);
 $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)) {
 	// Selection of new fields
@@ -212,7 +224,9 @@ 
 			if ($result < 0 && !count($tmpmember->errors)) {
 				setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
 			} else {
-				if ($result > 0) $nbclose++;
+				if ($result > 0) {
+					$nbclose++;
+				}
 			}
 		}
 
@@ -256,8 +270,9 @@ 
 $sql .= " t.libelle as type, t.subscription,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 // Add fields from extrafields
-if (!empty($extrafields->attributes[$object->table_element]['label']))
+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.', ' : '');
+}
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
@@ -276,16 +291,34 @@ 
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on (s.rowid = d.fk_soc)";
 $sql .= ", ".MAIN_DB_PREFIX."adherent_type as t";
 $sql .= " WHERE d.fk_adherent_type = t.rowid ";
-if ($catid > 0)    $sql .= " AND cm.fk_categorie = ".$db->escape($catid);
-if ($catid == -2)  $sql .= " AND cm.fk_categorie IS NULL";
-if ($search_categ > 0)   $sql .= " AND cm.fk_categorie = ".$db->escape($search_categ);
-if ($search_categ == -2) $sql .= " AND cm.fk_categorie IS NULL";
+if ($catid > 0) {
+	$sql .= " AND cm.fk_categorie = ".$db->escape($catid);
+}
+if ($catid == -2) {
+	$sql .= " AND cm.fk_categorie IS NULL";
+}
+if ($search_categ > 0) {
+	$sql .= " AND cm.fk_categorie = ".$db->escape($search_categ);
+}
+if ($search_categ == -2) {
+	$sql .= " AND cm.fk_categorie IS NULL";
+}
 $sql .= " AND d.entity IN (".getEntity('adherent').")";
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($search_type > 0) $sql .= " AND t.rowid=".$db->escape($search_type);
-if ($search_filter == 'withoutsubscription') $sql .= " AND (datefin IS NULL OR t.subscription = 0)";
-if ($search_filter == 'uptodate') $sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = 0)";
-if ($search_filter == 'outofdate') $sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
+if ($sall) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
+if ($search_type > 0) {
+	$sql .= " AND t.rowid=".$db->escape($search_type);
+}
+if ($search_filter == 'withoutsubscription') {
+	$sql .= " AND (datefin IS NULL OR t.subscription = 0)";
+}
+if ($search_filter == 'uptodate') {
+	$sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = 0)";
+}
+if ($search_filter == 'outofdate') {
+	$sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
+}
 if ($search_status != '') {
 	// Peut valoir un nombre ou liste de nombre separes par virgules
 	$sql .= " AND d.statut in (".$db->sanitize($db->escape($search_status)).")";
@@ -293,21 +326,51 @@ 
 if ($search_ref) {
 	$sql .= natural_search("d.ref", $search_ref);
 }
-if ($search_civility) $sql .= natural_search("d.civility", $search_civility);
-if ($search_firstname) $sql .= natural_search("d.firstname", $search_firstname);
-if ($search_lastname) $sql .= natural_search(array("d.firstname", "d.lastname", "d.societe"), $search_lastname);
-if ($search_gender != '' && $search_gender != '-1') $sql .= natural_search("d.gender", $search_gender);
-if ($search_login) $sql .= natural_search("d.login", $search_login);
-if ($search_company) $sql .= natural_search("s.nom", $search_company);
-if ($search_email) $sql .= natural_search("d.email", $search_email);
-if ($search_address) $sql .= natural_search("d.address", $search_address);
-if ($search_town)     $sql .= natural_search("d.town", $search_town);
-if ($search_zip)      $sql .= natural_search("d.zip", $search_zip);
-if ($search_state)    $sql .= natural_search("state.nom", $search_state);
-if ($search_phone)      $sql .= natural_search("d.phone", $search_phone);
-if ($search_phone_perso)      $sql .= natural_search("d.phone_perso", $search_phone_perso);
-if ($search_phone_mobile)      $sql .= natural_search("d.phone_mobile", $search_phone_mobile);
-if ($search_country) $sql .= " AND d.country IN (".$search_country.')';
+if ($search_civility) {
+	$sql .= natural_search("d.civility", $search_civility);
+}
+if ($search_firstname) {
+	$sql .= natural_search("d.firstname", $search_firstname);
+}
+if ($search_lastname) {
+	$sql .= natural_search(array("d.firstname", "d.lastname", "d.societe"), $search_lastname);
+}
+if ($search_gender != '' && $search_gender != '-1') {
+	$sql .= natural_search("d.gender", $search_gender);
+}
+if ($search_login) {
+	$sql .= natural_search("d.login", $search_login);
+}
+if ($search_company) {
+	$sql .= natural_search("s.nom", $search_company);
+}
+if ($search_email) {
+	$sql .= natural_search("d.email", $search_email);
+}
+if ($search_address) {
+	$sql .= natural_search("d.address", $search_address);
+}
+if ($search_town) {
+	$sql .= natural_search("d.town", $search_town);
+}
+if ($search_zip) {
+	$sql .= natural_search("d.zip", $search_zip);
+}
+if ($search_state) {
+	$sql .= natural_search("state.nom", $search_state);
+}
+if ($search_phone) {
+	$sql .= natural_search("d.phone", $search_phone);
+}
+if ($search_phone_perso) {
+	$sql .= natural_search("d.phone_perso", $search_phone_perso);
+}
+if ($search_phone_mobile) {
+	$sql .= natural_search("d.phone_mobile", $search_phone_mobile);
+}
+if ($search_country) {
+	$sql .= " AND d.country IN (".$search_country.')';
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -323,8 +386,11 @@ 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
-	if ($resql) $nbtotalofrecords = $db->num_rows($resql);
-	else dol_print_error($db);
+	if ($resql) {
+		$nbtotalofrecords = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
@@ -373,30 +439,78 @@ 
 }
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($sall != "") $param .= "&sall=".urlencode($sall);
-if ($search_ref)   $param .= "&search_ref=".urlencode($search_ref);
-if ($search_civility) $param .= "&search_civility=".urlencode($search_civility);
-if ($search_firstname) $param .= "&search_firstname=".urlencode($search_firstname);
-if ($search_lastname)  $param .= "&search_lastname=".urlencode($search_lastname);
-if ($search_gender)  $param .= "&search_gender=".urlencode($search_gender);
-if ($search_login)   $param .= "&search_login=".urlencode($search_login);
-if ($search_email)   $param .= "&search_email=".urlencode($search_email);
-if ($search_categ)   $param .= "&search_categ=".urlencode($search_categ);
-if ($search_company) $param .= "&search_company=".urlencode($search_company);
-if ($search_address != '') $param .= "&search_address=".urlencode($search_address);
-if ($search_town != '') $param .= "&search_town=".urlencode($search_town);
-if ($search_zip != '') $param .= "&search_zip=".urlencode($search_zip);
-if ($search_state != '') $param .= "&search_state=".urlencode($search_state);
-if ($search_country != '') $param .= "&search_country=".urlencode($search_country);
-if ($search_phone != '') $param .= "&search_phone=".urlencode($search_phone);
-if ($search_phone_perso != '') $param .= "&search_phone_perso=".urlencode($search_phone_perso);
-if ($search_phone_mobile != '') $param .= "&search_phone_mobile=".urlencode($search_phone_mobile);
-if ($search_filter && $search_filter != '-1') $param .= "&search_filter=".urlencode($search_filter);
-if ($search_status != "" && $search_status != '-1') $param .= "&search_status=".urlencode($search_status);
-if ($search_type > 0)       $param .= "&search_type=".urlencode($search_type);
-if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($sall != "") {
+	$param .= "&sall=".urlencode($sall);
+}
+if ($search_ref) {
+	$param .= "&search_ref=".urlencode($search_ref);
+}
+if ($search_civility) {
+	$param .= "&search_civility=".urlencode($search_civility);
+}
+if ($search_firstname) {
+	$param .= "&search_firstname=".urlencode($search_firstname);
+}
+if ($search_lastname) {
+	$param .= "&search_lastname=".urlencode($search_lastname);
+}
+if ($search_gender) {
+	$param .= "&search_gender=".urlencode($search_gender);
+}
+if ($search_login) {
+	$param .= "&search_login=".urlencode($search_login);
+}
+if ($search_email) {
+	$param .= "&search_email=".urlencode($search_email);
+}
+if ($search_categ) {
+	$param .= "&search_categ=".urlencode($search_categ);
+}
+if ($search_company) {
+	$param .= "&search_company=".urlencode($search_company);
+}
+if ($search_address != '') {
+	$param .= "&search_address=".urlencode($search_address);
+}
+if ($search_town != '') {
+	$param .= "&search_town=".urlencode($search_town);
+}
+if ($search_zip != '') {
+	$param .= "&search_zip=".urlencode($search_zip);
+}
+if ($search_state != '') {
+	$param .= "&search_state=".urlencode($search_state);
+}
+if ($search_country != '') {
+	$param .= "&search_country=".urlencode($search_country);
+}
+if ($search_phone != '') {
+	$param .= "&search_phone=".urlencode($search_phone);
+}
+if ($search_phone_perso != '') {
+	$param .= "&search_phone_perso=".urlencode($search_phone_perso);
+}
+if ($search_phone_mobile != '') {
+	$param .= "&search_phone_mobile=".urlencode($search_phone_mobile);
+}
+if ($search_filter && $search_filter != '-1') {
+	$param .= "&search_filter=".urlencode($search_filter);
+}
+if ($search_status != "" && $search_status != '-1') {
+	$param .= "&search_status=".urlencode($search_status);
+}
+if ($search_type > 0) {
+	$param .= "&search_type=".urlencode($search_type);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -405,10 +519,18 @@ 
 	//'presend'=>$langs->trans("SendByMail"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->adherent->creer) $arrayofmassactions['close'] = $langs->trans("Resiliate");
-if ($user->rights->adherent->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
+if ($user->rights->adherent->creer) {
+	$arrayofmassactions['close'] = $langs->trans("Resiliate");
+}
+if ($user->rights->adherent->supprimer) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if ($user->rights->societe->creer) {
+	$arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
+}
+if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
@@ -417,7 +539,9 @@ 
 }
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-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">';
@@ -434,7 +558,9 @@ 
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall) {
-	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", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -449,8 +575,11 @@ 
 }
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // 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)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
@@ -459,7 +588,9 @@ 
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+if ($massactionbutton) {
+	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+}
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
@@ -610,26 +741,66 @@ 
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))       print_liste_field_titre("ID", $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder);
-if (!empty($arrayfields['d.ref']['checked']))            print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], 'd.ref', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.civility']['checked']))       print_liste_field_titre($arrayfields['d.civility']['label'], $_SERVER["PHP_SELF"], 'd.civility', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.firstname']['checked']))      print_liste_field_titre($arrayfields['d.firstname']['label'], $_SERVER["PHP_SELF"], 'd.firstname', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.lastname']['checked']))       print_liste_field_titre($arrayfields['d.lastname']['label'], $_SERVER["PHP_SELF"], 'd.lastname', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.gender']['checked']))         print_liste_field_titre($arrayfields['d.gender']['label'], $_SERVER['PHP_SELF'], 'd.gender', $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['d.company']['checked']))        print_liste_field_titre($arrayfields['d.company']['label'], $_SERVER["PHP_SELF"], 'd.societe', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.login']['checked']))          print_liste_field_titre($arrayfields['d.login']['label'], $_SERVER["PHP_SELF"], 'd.login', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.morphy']['checked']))         print_liste_field_titre($arrayfields['d.morphy']['label'], $_SERVER["PHP_SELF"], 'd.morphy', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['t.libelle']['checked']))        print_liste_field_titre($arrayfields['t.libelle']['label'], $_SERVER["PHP_SELF"], 't.libelle', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.address']['checked']))        print_liste_field_titre($arrayfields['d.address']['label'], $_SERVER["PHP_SELF"], 'd.address', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.zip']['checked']))            print_liste_field_titre($arrayfields['d.zip']['label'], $_SERVER["PHP_SELF"], 'd.zip', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.town']['checked']))           print_liste_field_titre($arrayfields['d.town']['label'], $_SERVER["PHP_SELF"], 'd.town', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
-if (!empty($arrayfields['d.phone']['checked']))          print_liste_field_titre($arrayfields['d.phone']['label'], $_SERVER["PHP_SELF"], 'd.phone', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.phone_perso']['checked']))    print_liste_field_titre($arrayfields['d.phone_perso']['label'], $_SERVER["PHP_SELF"], 'd.phone_perso', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.phone_mobile']['checked']))   print_liste_field_titre($arrayfields['d.phone_mobile']['label'], $_SERVER["PHP_SELF"], 'd.phone_mobile', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.email']['checked']))          print_liste_field_titre($arrayfields['d.email']['label'], $_SERVER["PHP_SELF"], 'd.email', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.datefin']['checked']))        print_liste_field_titre($arrayfields['d.datefin']['label'], $_SERVER["PHP_SELF"], 'd.datefin', '', $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+	print_liste_field_titre("ID", $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], 'd.ref', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.civility']['checked'])) {
+	print_liste_field_titre($arrayfields['d.civility']['label'], $_SERVER["PHP_SELF"], 'd.civility', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.firstname']['checked'])) {
+	print_liste_field_titre($arrayfields['d.firstname']['label'], $_SERVER["PHP_SELF"], 'd.firstname', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.lastname']['checked'])) {
+	print_liste_field_titre($arrayfields['d.lastname']['label'], $_SERVER["PHP_SELF"], 'd.lastname', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.gender']['checked'])) {
+	print_liste_field_titre($arrayfields['d.gender']['label'], $_SERVER['PHP_SELF'], 'd.gender', $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.company']['checked'])) {
+	print_liste_field_titre($arrayfields['d.company']['label'], $_SERVER["PHP_SELF"], 'd.societe', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.login']['checked'])) {
+	print_liste_field_titre($arrayfields['d.login']['label'], $_SERVER["PHP_SELF"], 'd.login', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.morphy']['checked'])) {
+	print_liste_field_titre($arrayfields['d.morphy']['label'], $_SERVER["PHP_SELF"], 'd.morphy', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.libelle']['checked'])) {
+	print_liste_field_titre($arrayfields['t.libelle']['label'], $_SERVER["PHP_SELF"], 't.libelle', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.address']['checked'])) {
+	print_liste_field_titre($arrayfields['d.address']['label'], $_SERVER["PHP_SELF"], 'd.address', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.zip']['checked'])) {
+	print_liste_field_titre($arrayfields['d.zip']['label'], $_SERVER["PHP_SELF"], 'd.zip', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.town']['checked'])) {
+	print_liste_field_titre($arrayfields['d.town']['label'], $_SERVER["PHP_SELF"], 'd.town', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['state.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['country.code_iso']['checked'])) {
+	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.phone']['checked'])) {
+	print_liste_field_titre($arrayfields['d.phone']['label'], $_SERVER["PHP_SELF"], 'd.phone', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.phone_perso']['checked'])) {
+	print_liste_field_titre($arrayfields['d.phone_perso']['label'], $_SERVER["PHP_SELF"], 'd.phone_perso', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.phone_mobile']['checked'])) {
+	print_liste_field_titre($arrayfields['d.phone_mobile']['label'], $_SERVER["PHP_SELF"], 'd.phone_mobile', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.email']['checked'])) {
+	print_liste_field_titre($arrayfields['d.email']['label'], $_SERVER["PHP_SELF"], 'd.email', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.datefin']['checked'])) {
+	print_liste_field_titre($arrayfields['d.datefin']['label'], $_SERVER["PHP_SELF"], 'd.datefin', '', $param, 'align="center"', $sortfield, $sortorder);
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
@@ -637,10 +808,18 @@ 
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (!empty($arrayfields['d.datec']['checked']))     print_liste_field_titre($arrayfields['d.datec']['label'], $_SERVER["PHP_SELF"], "d.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-if (!empty($arrayfields['d.birth']['checked']))     print_liste_field_titre($arrayfields['d.birth']['label'], $_SERVER["PHP_SELF"], "d.birth", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-if (!empty($arrayfields['d.tms']['checked']))       print_liste_field_titre($arrayfields['d.tms']['label'], $_SERVER["PHP_SELF"], "d.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-if (!empty($arrayfields['d.statut']['checked']))    print_liste_field_titre($arrayfields['d.statut']['label'], $_SERVER["PHP_SELF"], "d.statut", "", $param, 'class="right"', $sortfield, $sortorder);
+if (!empty($arrayfields['d.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['d.datec']['label'], $_SERVER["PHP_SELF"], "d.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.birth']['checked'])) {
+	print_liste_field_titre($arrayfields['d.birth']['label'], $_SERVER["PHP_SELF"], "d.birth", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['d.tms']['label'], $_SERVER["PHP_SELF"], "d.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.statut']['checked'])) {
+	print_liste_field_titre($arrayfields['d.statut']['label'], $_SERVER["PHP_SELF"], "d.statut", "", $param, 'class="right"', $sortfield, $sortorder);
+}
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 print "</tr>\n";
 
@@ -677,7 +856,9 @@ 
 
 	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 		print '<td class="center">'.$obj->rowid.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Ref
@@ -685,35 +866,47 @@ 
 		print "<td>";
 		print $memberstatic->getNomUrl(-1, 0, 'card', 'ref', '', -1, 0, 1);
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Civility
 	if (!empty($arrayfields['d.civility']['checked'])) {
 		print "<td>";
 		print $obj->civility;
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Firstname
 	if (!empty($arrayfields['d.firstname']['checked'])) {
 		print "<td>";
 		print $obj->firstname;
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Lastname
 	if (!empty($arrayfields['d.lastname']['checked'])) {
 		print "<td>";
 		print $obj->lastname;
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Gender
 	if (!empty($arrayfields['d.gender']['checked'])) {
 		print '<td>';
-		if ($obj->gender) print $langs->trans("Gender".$obj->gender);
+		if ($obj->gender) {
+			print $langs->trans("Gender".$obj->gender);
+		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Company
 	if (!empty($arrayfields['d.company']['checked'])) {
@@ -724,7 +917,9 @@ 
 	// Login
 	if (!empty($arrayfields['d.login']['checked'])) {
 		print "<td>".$obj->login."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Nature (Moral/Physical)
 	if (!empty($arrayfields['d.morphy']['checked'])) {
@@ -738,7 +933,9 @@ 
 		}
 		print $s;
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Type label
 	if (!empty($arrayfields['t.libelle']['checked'])) {
@@ -747,33 +944,43 @@ 
 		print '<td class="nowrap">';
 		print $membertypestatic->getNomUrl(1, 32);
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Address
 	if (!empty($arrayfields['d.address']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->address;
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Zip
 	if (!empty($arrayfields['d.zip']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->zip;
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Town
 	if (!empty($arrayfields['d.town']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->town;
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// State
 	if (!empty($arrayfields['state.nom']['checked'])) {
 		print "<td>".$obj->state_name."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Country
 	if (!empty($arrayfields['country.code_iso']['checked'])) {
@@ -781,28 +988,36 @@ 
 		$tmparray = getCountry($obj->country, 'all');
 		print $tmparray['label'];
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Phone pro
 	if (!empty($arrayfields['d.phone']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone;
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Phone perso
 	if (!empty($arrayfields['d.phone_perso']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone_perso;
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Phone mobile
 	if (!empty($arrayfields['d.phone_mobile']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone_mobile;
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// EMail
 	if (!empty($arrayfields['d.email']['checked'])) {
@@ -823,7 +1038,9 @@ 
 			print '<td class="nowrap left">';
 			if ($obj->subscription == 'yes') {
 				print $langs->trans("SubscriptionNotReceived");
-				if ($obj->statut > 0) print " ".img_warning();
+				if ($obj->statut > 0) {
+					print " ".img_warning();
+				}
 			} else {
 				print '&nbsp;';
 			}
@@ -841,38 +1058,50 @@ 
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Birth
 	if (!empty($arrayfields['d.birth']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->birth), 'day', 'tzuser');
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Date modification
 	if (!empty($arrayfields['d.tms']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Status
 	if (!empty($arrayfields['d.statut']['checked'])) {
 		print '<td class="nowrap right">';
 		print $memberstatic->LibStatut($obj->statut, $obj->subscription, $datefin, 5);
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Action column
 	print '<td class="center">';
 	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($obj->rowid, $arrayofselected)) $selected = 1;
+		if (in_array($obj->rowid, $arrayofselected)) {
+			$selected = 1;
+		}
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print "</tr>\n";
 	$i++;
@@ -885,7 +1114,10 @@ 
 // If no record found
 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>';
 }
 

htdocs/comm/action/list.php

Spacing +1 added lines, -1 removed lines

@@ -298,7 +298,7 @@
 	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 }
 if ($user->rights->agenda->myactions->create) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $sql = "SELECT";

Braces +335 added lines, -119 removed lines

@@ -27,7 +27,9 @@ 
  *		\brief      Page to list actions
  */
 
-if (!defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);
+if (!defined("NOREDIRECTBYMAINTOLOGIN")) {
+	define('NOREDIRECTBYMAINTOLOGIN', 1);
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -58,11 +60,15 @@ 
 if (GETPOST('search_actioncode', 'array'))
 {
 	$actioncode = GETPOST('search_actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
-} else {
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+	} else {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
-if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($actioncode == '' && empty($actioncodearray)) {
+	$actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+}
 $search_id = GETPOST('search_id', 'alpha');
 $search_title = GETPOST('search_title', 'alpha');
 $search_note = GETPOST('search_note', 'alpha');
@@ -70,8 +76,12 @@ 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
 $datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
 $dateend = dol_mktime(0, 0, 0, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
-if ($search_status == '' && !GETPOSTISSET('search_status')) $search_status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
-if (empty($action) && !GETPOSTISSET('action')) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+if ($search_status == '' && !GETPOSTISSET('search_status')) {
+	$search_status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+}
+if (empty($action) && !GETPOSTISSET('action')) {
+	$action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+}
 
 $filter = GETPOST("search_filter", 'alpha', 3) ?GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
 $filtert = GETPOST("search_filtert", "int", 3) ?GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
@@ -103,27 +113,41 @@ 
 if (!$sortorder)
 {
 	$sortorder = "DESC,DESC";
-	if ($search_status == 'todo') $sortorder = "DESC,DESC";
-}
+	if ($search_status == 'todo') {
+		$sortorder = "DESC,DESC";
+	}
+	}
 if (!$sortfield)
 {
 	$sortfield = "a.datep,a.id";
-	if ($search_status == 'todo') $sortfield = "a.datep,a.id";
-}
+	if ($search_status == 'todo') {
+		$sortfield = "a.datep,a.id";
+	}
+	}
 
 // Security check
 $socid = GETPOST("search_socid", 'int') ?GETPOST("search_socid", 'int') : GETPOST("socid", 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
-if ($socid < 0) $socid = '';
+if ($socid < 0) {
+	$socid = '';
+}
 
 $canedit = 1;
-if (!$user->rights->agenda->myactions->read) accessforbidden();
-if (!$user->rights->agenda->allactions->read) $canedit = 0;
-if (!$user->rights->agenda->allactions->read || $filter == 'mine')	// If no permission to see all, we show only affected to me
+if (!$user->rights->agenda->myactions->read) {
+	accessforbidden();
+}
+if (!$user->rights->agenda->allactions->read) {
+	$canedit = 0;
+}
+if (!$user->rights->agenda->allactions->read || $filter == 'mine') {
+	// If no permission to see all, we show only affected to me
 {
 	$filtert = $user->id;
 }
+}
 
 $arrayfields = array(
 	'a.id'=>array('label'=>"Ref", 'checked'=>1),
@@ -174,15 +198,19 @@ 
 
 $parameters = array('id'=>$socid);
 $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');
+}
 
 // Selection of new fields
 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
 {
 	//$actioncode='';
 	$search_id = '';
+}
 	$search_title = '';
 	$search_note = '';
 	$datestart = '';
@@ -258,32 +286,78 @@ 
 $listofextcals = 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);
+}
 if ($actioncode != '') {
 	if (is_array($actioncode)) {
-		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
-	} else $param .= "&search_actioncode=".urlencode($actioncode);
-}
-if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid);
-if ($search_status != '' && $search_status > -1) $param .= "&search_status=".urlencode($search_status);
-if ($filter) $param .= "&search_filter=".urlencode($filter);
-if ($filtert) $param .= "&search_filtert=".urlencode($filtert);
-if ($socid) $param .= "&search_socid=".urlencode($socid);
-if ($showbirthday) $param .= "&search_showbirthday=1";
-if ($pid) $param .= "&search_projectid=".urlencode($pid);
-if ($type) $param .= "&search_type=".urlencode($type);
-if ($usergroup) $param .= "&search_usergroup=".urlencode($usergroup);
-if ($search_id != '') $param .= '&search_title='.urlencode($search_id);
-if ($search_title != '') $param .= '&search_title='.urlencode($search_title);
-if ($search_note != '') $param .= '&search_note='.$search_note;
-if (GETPOST('datestartday', 'int')) $param .= '&datestartday='.GETPOST('datestartday', 'int');
-if (GETPOST('datestartmonth', 'int')) $param .= '&datestartmonth='.GETPOST('datestartmonth', 'int');
-if (GETPOST('datestartyear', 'int')) $param .= '&datestartyear='.GETPOST('datestartyear', 'int');
-if (GETPOST('dateendday', 'int')) $param .= '&dateendday='.GETPOST('dateendday', 'int');
-if (GETPOST('dateendmonth', 'int')) $param .= '&dateendmonth='.GETPOST('dateendmonth', 'int');
-if (GETPOST('dateendyear', 'int')) $param .= '&dateendyear='.GETPOST('dateendyear', 'int');
-if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+		foreach ($actioncode as $str_action) {
+			$param .= "&search_actioncode[]=".urlencode($str_action);
+		}
+	} else {
+		$param .= "&search_actioncode=".urlencode($actioncode);
+	}
+	}
+if ($resourceid > 0) {
+	$param .= "&search_resourceid=".urlencode($resourceid);
+}
+if ($search_status != '' && $search_status > -1) {
+	$param .= "&search_status=".urlencode($search_status);
+}
+if ($filter) {
+	$param .= "&search_filter=".urlencode($filter);
+}
+if ($filtert) {
+	$param .= "&search_filtert=".urlencode($filtert);
+}
+if ($socid) {
+	$param .= "&search_socid=".urlencode($socid);
+}
+if ($showbirthday) {
+	$param .= "&search_showbirthday=1";
+}
+if ($pid) {
+	$param .= "&search_projectid=".urlencode($pid);
+}
+if ($type) {
+	$param .= "&search_type=".urlencode($type);
+}
+if ($usergroup) {
+	$param .= "&search_usergroup=".urlencode($usergroup);
+}
+if ($search_id != '') {
+	$param .= '&search_title='.urlencode($search_id);
+}
+if ($search_title != '') {
+	$param .= '&search_title='.urlencode($search_title);
+}
+if ($search_note != '') {
+	$param .= '&search_note='.$search_note;
+}
+if (GETPOST('datestartday', 'int')) {
+	$param .= '&datestartday='.GETPOST('datestartday', 'int');
+}
+if (GETPOST('datestartmonth', 'int')) {
+	$param .= '&datestartmonth='.GETPOST('datestartmonth', 'int');
+}
+if (GETPOST('datestartyear', 'int')) {
+	$param .= '&datestartyear='.GETPOST('datestartyear', 'int');
+}
+if (GETPOST('dateendday', 'int')) {
+	$param .= '&dateendday='.GETPOST('dateendday', 'int');
+}
+if (GETPOST('dateendmonth', 'int')) {
+	$param .= '&dateendmonth='.GETPOST('dateendmonth', 'int');
+}
+if (GETPOST('dateendyear', 'int')) {
+	$param .= '&dateendyear='.GETPOST('dateendyear', 'int');
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -297,12 +371,18 @@ 
 {
 	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 }
-if ($user->rights->agenda->myactions->create) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
+if ($user->rights->agenda->myactions->create) {
+	$arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $sql = "SELECT";
-if ($usergroup > 0) $sql .= " DISTINCT";
+if ($usergroup > 0) {
+	$sql .= " DISTINCT";
+}
 $sql .= " s.nom as societe, s.rowid as socid, s.client, s.email as socemail,";
 $sql .= " a.id, a.code, a.label, a.note, a.datep as dp, a.datep2 as dp2, a.fulldayevent, a.location,";
 $sql .= ' a.fk_user_author,a.fk_user_action,';
@@ -313,8 +393,10 @@ 
 
 // 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();
@@ -323,15 +405,23 @@ 
 
 $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_extrafields as ef ON (a.id = ef.fk_object) ";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
 $sql .= " ,".MAIN_DB_PREFIX."c_actioncomm as c";
 // We must filter on resource table
-if ($resourceid > 0) $sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
+if ($resourceid > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
-if ($usergroup > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+if ($filtert > 0 || $usergroup > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+}
+if ($usergroup > 0) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+}
 $sql .= " WHERE c.id = a.fk_action";
 $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
@@ -339,16 +429,24 @@ 
 {
 	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	{
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-		else {
-			if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
-			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND c.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND c.type = 'systemauto'";
+		} else {
+			if ($actioncode == 'AC_OTH') {
+				$sql .= " AND c.type != 'systemauto'";
+			}
+			if ($actioncode == 'AC_OTH_AUTO') {
+				$sql .= " AND c.type = 'systemauto'";
+			}
 		}
 	} else {
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-		else {
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND c.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND c.type = 'systemauto'";
+		} else {
 			if (is_array($actioncode))
 			{
 				$sql .= " AND c.code IN ('".implode("','", $actioncode)."')";
@@ -358,35 +456,64 @@ 
 		}
 	}
 }
-if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
-if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
-if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
+if ($resourceid > 0) {
+	$sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+}
+if ($pid) {
+	$sql .= " AND a.fk_project=".$db->escape($pid);
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
+}
+if ($socid > 0) {
+	$sql .= " AND s.rowid = ".$socid;
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
-if ($type) $sql .= " AND c.id = ".(int) $type;
+if ($filtert > 0 || $usergroup > 0) {
+	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+}
+if ($type) {
+	$sql .= " AND c.id = ".(int) $type;
+}
 if ($search_status == '0') { $sql .= " AND a.percent = 0"; }
 if ($search_status == '-1') { $sql .= " AND a.percent = -1"; }	// Not applicable
 if ($search_status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
 if ($search_status == '100') { $sql .= " AND a.percent = 100"; }
 if ($search_status == 'done') { $sql .= " AND (a.percent = 100)"; }
 if ($search_status == 'todo') { $sql .= " AND (a.percent >= 0 AND a.percent < 100)"; }
-if ($search_id) $sql .= natural_search("a.id", $search_id, 1);
-if ($search_title) $sql .= natural_search("a.label", $search_title);
-if ($search_note) $sql .= natural_search('a.note', $search_note);
+if ($search_id) {
+	$sql .= natural_search("a.id", $search_id, 1);
+}
+if ($search_title) {
+	$sql .= natural_search("a.label", $search_title);
+}
+if ($search_note) {
+	$sql .= natural_search('a.note', $search_note);
+}
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0)
 {
 	$sql .= " AND (";
-	if ($filtert > 0) $sql .= "(ar.fk_element = ".$filtert." OR (ar.fk_element IS NULL AND a.fk_user_action=".$filtert."))"; // The OR is for backward compatibility
-	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	if ($filtert > 0) {
+		$sql .= "(ar.fk_element = ".$filtert." OR (ar.fk_element IS NULL AND a.fk_user_action=".$filtert."))";
+	}
+	// The OR is for backward compatibility
+	if ($usergroup > 0) {
+		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	}
 	$sql .= ")";
 }
 
 // The second or of next test is to take event with no end date (we suppose duration is 1 hour in such case)
-if ($dateselect > 0) $sql .= " AND ((a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."') OR (a.datep2 IS NULL AND a.datep > '".$db->idate($dateselect - 3600)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."'))";
-if ($datestart > 0) $sql .= " AND a.datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($datestart + 3600 * 24 - 1)."'";
-if ($dateend > 0) $sql .= " AND a.datep2 BETWEEN '".$db->idate($dateend)."' AND '".$db->idate($dateend + 3600 * 24 - 1)."'";
+if ($dateselect > 0) {
+	$sql .= " AND ((a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."') OR (a.datep2 IS NULL AND a.datep > '".$db->idate($dateselect - 3600)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."'))";
+}
+if ($datestart > 0) {
+	$sql .= " AND a.datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($datestart + 3600 * 24 - 1)."'";
+}
+if ($dateend > 0) {
+	$sql .= " AND a.datep2 BETWEEN '".$db->idate($dateend)."' AND '".$db->idate($dateend + 3600 * 24 - 1)."'";
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -403,9 +530,11 @@ 
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -436,7 +565,9 @@ 
 
 	print '<form method="POST" id="searchFormList" class="listactionsfilter" 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="sortfield" value="'.$sortfield.'">';
@@ -444,8 +575,12 @@ 
 	print '<input type="hidden" name="type" value="'.$type.'">';
 	$nav = '';
 
-	if ($filter)          $nav .= '<input type="hidden" name="search_filter" value="'.$filter.'">';
-	if ($showbirthday)    $nav .= '<input type="hidden" name="search_showbirthday" value="1">';
+	if ($filter) {
+		$nav .= '<input type="hidden" name="search_filter" value="'.$filter.'">';
+	}
+	if ($showbirthday) {
+		$nav .= '<input type="hidden" name="search_showbirthday" value="1">';
+	}
 	print $nav;
 
 	//print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
@@ -541,7 +676,9 @@ 
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+	if ($massactionbutton) {
+		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+	}
 	$i = 0;
 
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -552,11 +689,21 @@ 
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['a.id']['checked']))		print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
-	if (!empty($arrayfields['owner']['checked']))		print '<td class="liste_titre"></td>';
-	if (!empty($arrayfields['c.libelle']['checked']))	print '<td class="liste_titre"></td>';
-	if (!empty($arrayfields['a.label']['checked']))	print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="'.$search_title.'"></td>';
-	if (!empty($arrayfields['a.note']['checked']))	print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_note" value="'.$search_note.'"></td>';
+	if (!empty($arrayfields['a.id']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
+	}
+	if (!empty($arrayfields['owner']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	if (!empty($arrayfields['c.libelle']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	if (!empty($arrayfields['a.label']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="'.$search_title.'"></td>';
+	}
+	if (!empty($arrayfields['a.note']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_note" value="'.$search_note.'"></td>';
+	}
 	if (!empty($arrayfields['a.datep']['checked'])) {
 		print '<td class="liste_titre nowraponall" align="center">';
 		print $form->selectDate($datestart, 'datestart', 0, 0, 1, '', 1, 0);
@@ -570,8 +717,12 @@ 
 	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre"></td>';
 	}
-	if (!empty($arrayfields['a.fk_contact']['checked']))	print '<td class="liste_titre"></td>';
-	if (!empty($arrayfields['a.fk_element']['checked']))	print '<td class="liste_titre"></td>';
+	if (!empty($arrayfields['a.fk_contact']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	if (!empty($arrayfields['a.fk_element']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
 
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -581,8 +732,12 @@ 
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	if (!empty($arrayfields['a.datec']['checked']))	print '<td class="liste_titre"></td>';
-	if (!empty($arrayfields['a.tms']['checked']))		print '<td class="liste_titre"></td>';
+	if (!empty($arrayfields['a.datec']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	if (!empty($arrayfields['a.tms']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
 	if (!empty($arrayfields['a.percent']['checked'])) {
 		print '<td class="liste_titre center">';
 		$formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'minwidth100imp maxwidth125');
@@ -597,17 +752,37 @@ 
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['a.id']['checked']))	      print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"], "a.id", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['owner']['checked']))        print_liste_field_titre($arrayfields['owner']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['c.libelle']['checked']))	  print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['a.label']['checked']))	  print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['a.note']['checked']))		  print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
+	if (!empty($arrayfields['a.id']['checked'])) {
+		print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"], "a.id", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['owner']['checked'])) {
+		print_liste_field_titre($arrayfields['owner']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.libelle']['checked'])) {
+		print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.label']['checked'])) {
+		print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.note']['checked'])) {
+		print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
+	}
 	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	if (!empty($arrayfields['a.datep']['checked']))	  print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep,a.id", $param, '', 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['a.datep2']['checked']))	  print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.nom']['checked']))	      print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['a.fk_contact']['checked'])) print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['a.fk_element']['checked'])) print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+	if (!empty($arrayfields['a.datep']['checked'])) {
+		print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep,a.id", $param, '', 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.datep2']['checked'])) {
+		print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.fk_contact']['checked'])) {
+		print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.fk_element']['checked'])) {
+		print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+	}
 
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -617,10 +792,16 @@ 
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	if (!empty($arrayfields['a.datec']['checked'])) print_liste_field_titre($arrayfields['a.datec']['label'], $_SERVER["PHP_SELF"], "a.datec,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['a.tms']['checked'])) print_liste_field_titre($arrayfields['a.tms']['label'], $_SERVER["PHP_SELF"], "a.tms,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['a.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['a.datec']['label'], $_SERVER["PHP_SELF"], "a.datec,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['a.tms']['label'], $_SERVER["PHP_SELF"], "a.tms,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+	}
 
-	if (!empty($arrayfields['a.percent']['checked']))print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['a.percent']['checked'])) {
+		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -673,7 +854,9 @@ 
 			{
 				$userstatic->fetch($obj->fk_user_action);
 				print $userstatic->getNomUrl(-1);
-			} else print '&nbsp;';
+			} else {
+				print '&nbsp;';
+			}
 			print '</td>';
 		}
 
@@ -689,24 +872,39 @@ 
 				if ($actioncomm->type_picto) {
 					$imgpicto = img_picto('', $actioncomm->type_picto);
 				} else {
-					if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-					elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-					elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-					elseif ($actioncomm->type_code == 'AC_EMAIL' || $actioncomm->type_code == 'AC_EMAIL_IN')   $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-					elseif ($actioncomm->type_code == 'AC_INT')     $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-					elseif ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' ';
-					elseif (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_other', '', false, 0, 0, '', 'paddingright').' ';
+					if ($actioncomm->type_code == 'AC_RDV') {
+						$imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif ($actioncomm->type_code == 'AC_TEL') {
+						$imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif ($actioncomm->type_code == 'AC_FAX') {
+						$imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif ($actioncomm->type_code == 'AC_EMAIL' || $actioncomm->type_code == 'AC_EMAIL_IN') {
+						$imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif ($actioncomm->type_code == 'AC_INT') {
+						$imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') {
+						$imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif (!preg_match('/_AUTO/', $actioncomm->type_code)) {
+						$imgpicto = img_picto('', 'object_other', '', false, 0, 0, '', 'paddingright').' ';
+					}
 				}
 			}
 			print $imgpicto;
 
 			$labeltype = $obj->type_code;
-			if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) $labeltype = 'AC_OTH';
+			if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) {
+				$labeltype = 'AC_OTH';
+			}
 			if ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') {
 				$labeltype = $langs->trans("Message");
 			} else {
-				if (!empty($arraylist[$labeltype])) $labeltype = $arraylist[$labeltype];
-				if ($obj->type_code == 'AC_OTH_AUTO' && ($obj->type_code != $obj->code) && $labeltype && !empty($arraylist[$obj->code])) $labeltype .= ' - '.$arraylist[$obj->code]; // Use code in priority on type_code
+				if (!empty($arraylist[$labeltype])) {
+					$labeltype = $arraylist[$labeltype];
+				}
+				if ($obj->type_code == 'AC_OTH_AUTO' && ($obj->type_code != $obj->code) && $labeltype && !empty($arraylist[$obj->code])) {
+					$labeltype .= ' - '.$arraylist[$obj->code];
+				}
+				// Use code in priority on type_code
 			}
 			print dol_trunc($labeltype, 28);
 			print '</td>';
@@ -734,11 +932,21 @@ 
 			print '<td class="center nowraponall">';
 			print dol_print_date($db->jdate($obj->dp), $formatToUse);
 			$late = 0;
-			if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
-			if ($obj->percent == 0 && !$obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
-			if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && $db->jdate($obj->dp2) < ($now - $delay_warning)) $late = 1;
-			if ($obj->percent > 0 && $obj->percent < 100 && !$obj->dp2 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
-			if ($late) print img_warning($langs->trans("Late")).' ';
+			if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($obj->percent == 0 && !$obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && $db->jdate($obj->dp2) < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($obj->percent > 0 && $obj->percent < 100 && !$obj->dp2 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($late) {
+				print img_warning($langs->trans("Late")).' ';
+			}
 			print '</td>';
 		}
 
@@ -760,7 +968,9 @@ 
 				$societestatic->email = $obj->socemail;
 
 				print $societestatic->getNomUrl(1, '', 28);
-			} else print '&nbsp;';
+			} else {
+				print '&nbsp;';
+			}
 			print '</td>';
 		}
 
@@ -790,9 +1000,11 @@ 
 				if (!empty($contactList)) {
 					print implode(', ', $contactList);
 				}
-			} elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
+			} elseif ($obj->fk_contact > 0) {
+				//keep for retrocompatibility with faraway event
 			{
 				$contactstatic->id = $obj->fk_contact;
+			}
 				$contactstatic->email = $obj->email;
 				$contactstatic->lastname = $obj->lastname;
 				$contactstatic->firstname = $obj->firstname;
@@ -843,10 +1055,14 @@ 
 		}
 		// 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($obj->id, $arrayofselected)) $selected = 1;
+		}
+			if (in_array($obj->id, $arrayofselected)) {
+				$selected = 1;
+			}
 			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';

htdocs/user/list.php

Braces +302 added lines, -101 removed lines

@@ -78,16 +78,22 @@ 
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-if (!$sortfield) $sortfield = "u.login";
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "u.login";
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Initialize array of search criterias
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : 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');
+	}
+	}
 
 $userstatic = new User($db);
 $companystatic = new Societe($db);
@@ -152,8 +158,12 @@ 
 $catid = GETPOST('catid', 'int');
 
 // Default search
-if ($search_statut == '') $search_statut = '1';
-if ($mode == 'employee' && !GETPOSTISSET('search_employee')) $search_employee = 1;
+if ($search_statut == '') {
+	$search_statut = '1';
+}
+if ($mode == 'employee' && !GETPOSTISSET('search_employee')) {
+	$search_employee = 1;
+}
 
 // Define value to know what current user can do on users
 $permissiontoadd = (!empty($user->admin) || $user->rights->user->user->creer);
@@ -182,7 +192,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))
 {
@@ -190,9 +202,11 @@ 
 	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
 	{
 		$search_user = "";
+	}
 		$search_login = "";
 		$search_lastname = "";
 		$search_firstname = "";
@@ -251,7 +265,9 @@ 
 						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 						$error++;
 						break;
-					} else $nbok++;
+					} else {
+						$nbok++;
+					}
 				} else {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
@@ -269,8 +285,11 @@ 
 
 			if (!$error)
 			{
-				if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-				else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+				if ($nbok > 1) {
+					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+				} else {
+					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+				}
 				$db->commit();
 			} else {
 				$db->rollback();
@@ -304,8 +323,10 @@ 
 $sql .= " s.nom as name, s.canvas";
 // 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); // Note that $action and $object may have been modified by hook
@@ -313,10 +334,15 @@ 
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-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 (u.rowid = ef.fk_object)";
+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 (u.rowid = ef.fk_object)";
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_soc = s.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid";
-if (!empty($search_categ) || !empty($catid)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_user as cu ON u.rowid = cu.fk_user"; // We'll need this table joined to the select in order to filter by categ
+if (!empty($search_categ) || !empty($catid)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_user as cu ON u.rowid = cu.fk_user";
+}
+// We'll need this table joined to the select in order to filter by categ
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printUserListWhere', $parameters); // Note that $action and $object may have been modified by hook
@@ -325,27 +351,62 @@ 
 } else {
 	$sql .= " WHERE u.entity IN (".getEntity('user').")";
 }
-if ($socid > 0) $sql .= " AND u.fk_soc = ".$socid;
+if ($socid > 0) {
+	$sql .= " AND u.fk_soc = ".$socid;
+}
 //if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
-if ($search_supervisor > 0)   $sql .= " AND u.fk_user IN (".$db->sanitize($db->escape($search_supervisor)).")";
-if ($search_thirdparty != '') $sql .= natural_search(array('s.nom'), $search_thirdparty);
-if ($search_login != '')      $sql .= natural_search("u.login", $search_login);
-if ($search_lastname != '')   $sql .= natural_search("u.lastname", $search_lastname);
-if ($search_firstname != '')  $sql .= natural_search("u.firstname", $search_firstname);
-if ($search_gender != '' && $search_gender != '-1')     $sql .= " AND u.gender = '".$db->escape($search_gender)."'"; // Cannot use natural_search as looking for %man% also includes woman
+if ($search_supervisor > 0) {
+	$sql .= " AND u.fk_user IN (".$db->sanitize($db->escape($search_supervisor)).")";
+}
+if ($search_thirdparty != '') {
+	$sql .= natural_search(array('s.nom'), $search_thirdparty);
+}
+if ($search_login != '') {
+	$sql .= natural_search("u.login", $search_login);
+}
+if ($search_lastname != '') {
+	$sql .= natural_search("u.lastname", $search_lastname);
+}
+if ($search_firstname != '') {
+	$sql .= natural_search("u.firstname", $search_firstname);
+}
+if ($search_gender != '' && $search_gender != '-1') {
+	$sql .= " AND u.gender = '".$db->escape($search_gender)."'";
+}
+// Cannot use natural_search as looking for %man% also includes woman
 if (is_numeric($search_employee) && $search_employee >= 0) {
 	$sql .= ' AND u.employee = '.(int) $search_employee;
 }
-if ($search_accountancy_code != '')  $sql .= natural_search("u.accountancy_code", $search_accountancy_code);
-if ($search_email != '')             $sql .= natural_search("u.email", $search_email);
-if ($search_api_key != '')           $sql .= natural_search("u.api_key", $search_api_key);
-if ($search_statut != '' && $search_statut >= 0) $sql .= " AND u.statut IN (".$db->sanitize($db->escape($search_statut)).")";
-if ($sall)                           $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($catid > 0)     $sql .= " AND cu.fk_categorie = ".((int) $catid);
-if ($catid == -2)   $sql .= " AND cu.fk_categorie IS NULL";
-if ($search_categ > 0)   $sql .= " AND cu.fk_categorie = ".$db->escape($search_categ);
-if ($search_categ == -2) $sql .= " AND cu.fk_categorie IS NULL";
-if ($mode == 'employee' && empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")";
+if ($search_accountancy_code != '') {
+	$sql .= natural_search("u.accountancy_code", $search_accountancy_code);
+}
+if ($search_email != '') {
+	$sql .= natural_search("u.email", $search_email);
+}
+if ($search_api_key != '') {
+	$sql .= natural_search("u.api_key", $search_api_key);
+}
+if ($search_statut != '' && $search_statut >= 0) {
+	$sql .= " AND u.statut IN (".$db->sanitize($db->escape($search_statut)).")";
+}
+if ($sall) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
+if ($catid > 0) {
+	$sql .= " AND cu.fk_categorie = ".((int) $catid);
+}
+if ($catid == -2) {
+	$sql .= " AND cu.fk_categorie IS NULL";
+}
+if ($search_categ > 0) {
+	$sql .= " AND cu.fk_categorie = ".$db->escape($search_categ);
+}
+if ($search_categ == -2) {
+	$sql .= " AND cu.fk_categorie IS NULL";
+}
+if ($mode == 'employee' && empty($user->rights->salaries->readall)) {
+	$sql .= " AND s.fk_user IN (".join(',', $childids).")";
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -360,9 +421,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;
 	}
 }
@@ -371,7 +434,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)
@@ -398,38 +463,82 @@ 
 llxHeader('', $langs->trans("ListOfUsers"), $help_url);
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&amp;contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&amp;limit='.urlencode($limit);
-if ($sall != '') $param .= '&amp;sall='.urlencode($sall);
-if ($search_user != '') $param .= "&amp;search_user=".urlencode($search_user);
-if ($search_login != '') $param .= "&amp;search_login=".urlencode($search_login);
-if ($search_lastname != '') $param .= "&amp;search_lastname=".urlencode($search_lastname);
-if ($search_firstname != '') $param .= "&amp;search_firstname=".urlencode($search_firstname);
-if ($search_gender != '') $param .= "&amp;search_gender=".urlencode($search_gender);
-if ($search_employee != '') $param .= "&amp;search_employee=".urlencode($search_employee);
-if ($search_accountancy_code != '') $param .= "&amp;search_accountancy_code=".urlencode($search_accountancy_code);
-if ($search_email != '') $param .= "&amp;search_email=".urlencode($search_email);
-if ($search_api_key != '') $param .= "&amp;search_api_key=".urlencode($search_api_key);
-if ($search_supervisor > 0) $param .= "&amp;search_supervisor=".urlencode($search_supervisor);
-if ($search_statut != '') $param .= "&amp;search_statut=".urlencode($search_statut);
-if ($optioncss != '') $param .= '&amp;optioncss='.urlencode($optioncss);
-if ($mode != '')      $param .= '&amp;mode='.urlencode($mode);
-if ($search_categ > 0) $param .= "&amp;search_categ=".urlencode($search_categ);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&amp;contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&amp;limit='.urlencode($limit);
+}
+if ($sall != '') {
+	$param .= '&amp;sall='.urlencode($sall);
+}
+if ($search_user != '') {
+	$param .= "&amp;search_user=".urlencode($search_user);
+}
+if ($search_login != '') {
+	$param .= "&amp;search_login=".urlencode($search_login);
+}
+if ($search_lastname != '') {
+	$param .= "&amp;search_lastname=".urlencode($search_lastname);
+}
+if ($search_firstname != '') {
+	$param .= "&amp;search_firstname=".urlencode($search_firstname);
+}
+if ($search_gender != '') {
+	$param .= "&amp;search_gender=".urlencode($search_gender);
+}
+if ($search_employee != '') {
+	$param .= "&amp;search_employee=".urlencode($search_employee);
+}
+if ($search_accountancy_code != '') {
+	$param .= "&amp;search_accountancy_code=".urlencode($search_accountancy_code);
+}
+if ($search_email != '') {
+	$param .= "&amp;search_email=".urlencode($search_email);
+}
+if ($search_api_key != '') {
+	$param .= "&amp;search_api_key=".urlencode($search_api_key);
+}
+if ($search_supervisor > 0) {
+	$param .= "&amp;search_supervisor=".urlencode($search_supervisor);
+}
+if ($search_statut != '') {
+	$param .= "&amp;search_statut=".urlencode($search_statut);
+}
+if ($optioncss != '') {
+	$param .= '&amp;optioncss='.urlencode($optioncss);
+}
+if ($mode != '') {
+	$param .= '&amp;mode='.urlencode($mode);
+}
+if ($search_categ > 0) {
+	$param .= "&amp;search_categ=".urlencode($search_categ);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
 $arrayofmassactions = array();
-if ($permissiontoadd) $arrayofmassactions['disable'] = $langs->trans("DisableUser");
-if ($permissiontoadd) $arrayofmassactions['reactivate'] = $langs->trans("Reactivate");
-if ($permissiontoadd) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
+if ($permissiontoadd) {
+	$arrayofmassactions['disable'] = $langs->trans("DisableUser");
+}
+if ($permissiontoadd) {
+	$arrayofmassactions['reactivate'] = $langs->trans("Reactivate");
+}
+if ($permissiontoadd) {
+	$arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
+}
 //if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
+	$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="sortfield" value="'.$sortfield.'">';
@@ -438,7 +547,9 @@ 
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $url = DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=';
-if (!empty($socid)) $url .= '&socid='.$socid;
+if (!empty($socid)) {
+	$url .= '&socid='.$socid;
+}
 
 $newcardbutton = dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
@@ -467,7 +578,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>';
 }
 
@@ -487,8 +600,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))
 {
@@ -605,29 +721,63 @@ 
 
 
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['u.login']['checked']))          print_liste_field_titre("Login", $_SERVER['PHP_SELF'], "u.login", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.lastname']['checked']))       print_liste_field_titre("Lastname", $_SERVER['PHP_SELF'], "u.lastname", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.firstname']['checked']))      print_liste_field_titre("FirstName", $_SERVER['PHP_SELF'], "u.firstname", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.gender']['checked']))         print_liste_field_titre("Gender", $_SERVER['PHP_SELF'], "u.gender", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.employee']['checked']))       print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.employee", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.fk_user']['checked']))        print_liste_field_titre("HierarchicalResponsible", $_SERVER['PHP_SELF'], "u.fk_user", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.accountancy_code']['checked'])) print_liste_field_titre("AccountancyCode", $_SERVER['PHP_SELF'], "u.accountancy_code", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.email']['checked']))          print_liste_field_titre("EMail", $_SERVER['PHP_SELF'], "u.email", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.api_key']['checked']))        print_liste_field_titre("ApiKey", $_SERVER['PHP_SELF'], "u.api_key", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.fk_soc']['checked']))         print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "u.fk_soc", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.entity']['checked']))         print_liste_field_titre("Entity", $_SERVER['PHP_SELF'], "u.entity", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.salary']['checked']))         print_liste_field_titre("Salary", $_SERVER['PHP_SELF'], "u.salary", $param, "", "", $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['u.datelastlogin']['checked']))  print_liste_field_titre("LastConnexion", $_SERVER['PHP_SELF'], "u.datelastlogin", $param, "", '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['u.datepreviouslogin']['checked'])) print_liste_field_titre("PreviousConnexion", $_SERVER['PHP_SELF'], "u.datepreviouslogin", $param, "", '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['u.login']['checked'])) {
+	print_liste_field_titre("Login", $_SERVER['PHP_SELF'], "u.login", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['u.lastname']['checked'])) {
+	print_liste_field_titre("Lastname", $_SERVER['PHP_SELF'], "u.lastname", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['u.firstname']['checked'])) {
+	print_liste_field_titre("FirstName", $_SERVER['PHP_SELF'], "u.firstname", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['u.gender']['checked'])) {
+	print_liste_field_titre("Gender", $_SERVER['PHP_SELF'], "u.gender", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['u.employee']['checked'])) {
+	print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.employee", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['u.fk_user']['checked'])) {
+	print_liste_field_titre("HierarchicalResponsible", $_SERVER['PHP_SELF'], "u.fk_user", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['u.accountancy_code']['checked'])) {
+	print_liste_field_titre("AccountancyCode", $_SERVER['PHP_SELF'], "u.accountancy_code", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['u.email']['checked'])) {
+	print_liste_field_titre("EMail", $_SERVER['PHP_SELF'], "u.email", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['u.api_key']['checked'])) {
+	print_liste_field_titre("ApiKey", $_SERVER['PHP_SELF'], "u.api_key", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['u.fk_soc']['checked'])) {
+	print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "u.fk_soc", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['u.entity']['checked'])) {
+	print_liste_field_titre("Entity", $_SERVER['PHP_SELF'], "u.entity", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['u.salary']['checked'])) {
+	print_liste_field_titre("Salary", $_SERVER['PHP_SELF'], "u.salary", $param, "", "", $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['u.datelastlogin']['checked'])) {
+	print_liste_field_titre("LastConnexion", $_SERVER['PHP_SELF'], "u.datelastlogin", $param, "", '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['u.datepreviouslogin']['checked'])) {
+	print_liste_field_titre("PreviousConnexion", $_SERVER['PHP_SELF'], "u.datepreviouslogin", $param, "", '', $sortfield, $sortorder, 'center ');
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (!empty($arrayfields['u.datec']['checked']))  print_liste_field_titre("DateCreationShort", $_SERVER["PHP_SELF"], "u.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (!empty($arrayfields['u.tms']['checked']))    print_liste_field_titre("DateModificationShort", $_SERVER["PHP_SELF"], "u.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (!empty($arrayfields['u.statut']['checked'])) print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "u.statut", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['u.datec']['checked'])) {
+	print_liste_field_titre("DateCreationShort", $_SERVER["PHP_SELF"], "u.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['u.tms']['checked'])) {
+	print_liste_field_titre("DateModificationShort", $_SERVER["PHP_SELF"], "u.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['u.statut']['checked'])) {
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "u.statut", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 // Action column
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 print '</tr>'."\n";
@@ -639,7 +789,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
 	}
 }
 
@@ -652,7 +805,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);
@@ -685,29 +841,41 @@ 
 			print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['u.lastname']['checked']))
 	{
 		  print '<td class="tdoverflowmax150">'.$obj->lastname.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['u.firstname']['checked']))
 	{
 		print '<td class="tdoverflowmax150">'.$obj->firstname.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['u.gender']['checked']))
 	{
 		print '<td>';
-		if ($obj->gender) print $langs->trans("Gender".$obj->gender);
+		if ($obj->gender) {
+			print $langs->trans("Gender".$obj->gender);
+		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['u.employee']['checked']))
 	{
 		print '<td>'.yn($obj->employee).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Supervisor
@@ -737,23 +905,31 @@ 
 	        }
 	    }
 	    print '</td>';
-	    if (!$i) $totalarray['nbfield']++;
+	    if (!$i) {
+	    	$totalarray['nbfield']++;
+	    }
 	}
 
 	if (!empty($arrayfields['u.accountancy_code']['checked']))
 	{
 		print '<td>'.$obj->accountancy_code.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['u.email']['checked']))
 	{
 		print '<td>'.$obj->email.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['u.api_key']['checked']))
 	{
 		print '<td>'.$obj->api_key.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['u.fk_soc']['checked']))
 	{
@@ -771,7 +947,9 @@ 
 			print $langs->trans("InternalUser");
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Multicompany enabled
 	if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
@@ -787,7 +965,9 @@ 
 				print $mc->label;
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 	}
 
@@ -795,20 +975,26 @@ 
 	if (!empty($arrayfields['u.salary']['checked']))
 	{
 	    print '<td class="nowraponall right">'.($obj->salary ? price($obj->salary) : '').'</td>';
-	    if (!$i) $totalarray['nbfield']++;
+	    if (!$i) {
+	    	$totalarray['nbfield']++;
+	    }
 	}
 
 	// Date last login
 	if (!empty($arrayfields['u.datelastlogin']['checked']))
 	{
 		print '<td class="nowrap center">'.dol_print_date($db->jdate($obj->datelastlogin), "dayhour").'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Date previous login
 	if (!empty($arrayfields['u.datepreviouslogin']['checked']))
 	{
 		print '<td class="nowrap center">'.dol_print_date($db->jdate($obj->datepreviouslogin), "dayhour").'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Extra fields
@@ -823,7 +1009,9 @@ 
 		print '<td class="center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Date modification
 	if (!empty($arrayfields['u.tms']['checked']))
@@ -831,25 +1019,35 @@ 
 		print '<td class="center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Status
 	if (!empty($arrayfields['u.statut']['checked']))
 	{
 		$userstatic->statut = $obj->statut;
 		print '<td class="center">'.$userstatic->getLibStatut(5).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// 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";
 
@@ -863,7 +1061,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>';
 }